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