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