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