Version 1.1.2
Merge branch 'master' into ffmpeg_1_2