Minor optimisation of URLs
Merge branch 'master' of git://github.com/nursix/eden
Branch tag.