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