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