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