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