Commit [674348]  Maximize  Restore  History

Merge branch 'master' into acs2/5518

Alvaro del Castillo Alvaro del Castillo 2013-04-16