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