Merge branch 'w13_MDL-22733_21_youtubeiframe' of git://github.com/skodak/moodle