gyp-svn to 1658