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