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