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