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