Merge branch 'w36_MDL-28455_m22_tinymce' of git://github.com/skodak/moodle