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