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