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