test
attempt to fix || behavior
Merge branch 'node-pre-gyp' into node-pre-gyp-osx