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