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