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