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