Merge branch 'MDL-64186-35-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_35_...