Backport from branch
Merge branch 'master' of git://github.com/nursix/eden