Backport of https://github.com/nodejs/node/pull/7630 for v4.x#8348

Trott wants to merge 4 commits into

nodejs:v4.x-stagingnodejs/node:v4.x-stagingfrom

Trott:v4.x-braces-backportTrott/io.js:v4.x-braces-backportCopy head branch name to clipboard