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