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