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