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