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