Merge branch 'MOODLE_25_STABLE' of git://git.moodle.org/moodle into MOODLE_25_STABLE
MDL-42111 TinyMCE media preview: fix video preview display for TinyMCE media.
Effected themes: boxxie, clean, brick, formal_white and splash.