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