merge from 3.2 - change the extra svn to svn+ssh