Commit [800c1e]  Maximize  Restore  History

Merge tag 'upstream/3.5.25.3'

Barak A. Pearlmutter Barak A. Pearlmutter 2012-06-16