Merge remote-tracking branch 'upstream/v0.10'
Conflicts: deps/uv/ChangeLog deps/uv/build.mk deps/uv/src/version.c deps/uv/test/test-ipc.c deps/v8/src/objects.cc src/node.cc src/node_os.cc
Conflicts: deps/uv/ChangeLog deps/uv/build.mk deps/uv/src/version.c deps/uv/test/test-ipc.c deps/v8/src/objects.cc src/node.cc src/node_os.cc
mentioned in commit e10892cc
·mentioned in commit e10892cc