Commit [48677e]  Maximize  Restore  History

Merge branch 'master' into 4.1-dev

Conflicts:
ChangeLog

Earnie Boyd Earnie Boyd 2013-09-18