Commit [5933a5] Maximize Restore History

Merge remote branch 'upstream/2.0' into 2.0

lethality lethality 2014-02-18