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