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