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