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