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