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