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