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