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