Merge branch 'wip-mdl-41266' of https://github.com/rajeshtaneja/moodle