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