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