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