Merge pull request #2147 from commodo/node-x86-build-fix