Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle