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