Merge branch 'sg/prompt-svn-remote-fix' into maint