Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle