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