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