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