remove this macro from master too, issue 29 says it is removed but git svn rebase did not get the change for me