Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle