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