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