prepare to merge git-svn into develop