Sync git svn branch with SVN repository r33308.