merge v1.x into master#1582

Fishrock123 merged 4 commits intonodejs:masternodejs/node:masterfrom

Fishrock123:master-with-v1.x-mergeFishrock123/node:master-with-v1.x-mergeCopy head branch name to clipboard