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