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