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