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