Fix home URI when saving the home entry.
Merge branch 'master' into development