Merge branch 'MDL-66743' of https://github.com/timhunt/moodle