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