Merge branch 'ap/remote-hg-tilde-is-home-directory'