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