Merge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle