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