svn branch now identical to master