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