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