Merge branch 'MDL-44093-master-flowplayer' of git://github.com/mudrd8mz/moodle