Merge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle