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