Merge branch 'w13_MDL-26909_20_mediatests' of git://github.com/skodak/moodle into...