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