Merge branch 'tg/maint-zsh-svn-remote-prompt'