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