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