Commit [9b1d54]  Maximize  Restore  History

Merge branch 'master' into ffmpeg