Merge Michael (partial) & fixup
Merge branch 'master' of git://github.com/flavour/eden