Merge commit 'git-svn'