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