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