Commit [14596e] Maximize Restore History

Merge branch 'master' into faust2

Stephane Letz Stephane Letz 2014-04-18