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