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