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