Merge branch 'MDL-68972-38-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_38_...