Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle