Port patches and fixes over from node

Can't show this merge request because the source branch github/fork/piscisaureus/merge is missing from project rodrigo-test/test-group-nodejs/node. Close this merge request or update the source branch.