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