merging the svn+git capable build from svn