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