Commit [80b167] 4.0.2 Maximize Restore History

Merge branch '4.0-dev'

Earnie Boyd Earnie Boyd 2013-09-15