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