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