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