Merge branch 'w11_MDL-31913_m22_tinymce' of git://github.com/skodak/moodle into MOODL...