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