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