Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle