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