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