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