Commit [520e9e] Maximize Restore History

Merge branch 'master' into 4.1-dev

Conflicts:
.gitignore
ChangeLog
include/rpc.h

Earnie Boyd Earnie Boyd 2013-08-10