git-svn of mirage (I use branch kbu-working)