Commit [5e107f] Maximize Restore History

Merge remote-tracking branch 'origin/beta_2.9' into beta_2.9

Oscar Gustafsson Oscar Gustafsson 2012-11-14