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