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