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