CRMT: Partial merge from Michael
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/nursix/eden