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