Merge branch 'MDL-69998-master-enfix' of git://github.com/mudrd8mz/moodle into master