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