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