Merge branch 'ss/svn-prompt' into maint