Commit [24ec6d]  Maximize  Restore  History

Merge branch 'master' into ffmpeg