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