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