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