pulled in changes from Node 0.11.10
0.11.10