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