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