git-svn: rebuild convenience and bugfixes