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