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