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