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