Summary of changes:
f57212c... Update to recent git version (*)
0abdff7... Update to recent git version (*)
0404d29... Rebuilt for ffmpeg-3.1.1 (*)
0d3453d... Update to recent git version (*)
a44f9c2... Merge branch 'master' into f24
(*) This commit already existed in another branch; no separate mail sent