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