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