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