Merge branch 'km/git-svn-workaround-older-getopt-long'