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