Merge branch 'MDL-73201-311-enfix' of https://github.com/mudrd8mz/moodle into MOODLE_...