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