Merge branch 'MDL-76105-master-enfix' of https://github.com/vmdef/moodle