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