remove svn dependency
auto-merge staging into master