Merge branch 'wip-mdl-40400' of git://github.com/rajeshtaneja/moodle