Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle