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