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