Fix Location Context in S3Profile, other DRMP tweaks
Merge branch 'master' of git://github.com/flavour/eden