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