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