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