Merge branch 'spidermonkey_version_nif' of github.com:apache/couchdb into spidermonkey_version_nif