RMS Fixes.
Merge https://github.com/flavour/eden into masterLocal