Merge branch 'MDL-60317' of git://github.com/timhunt/moodle