Propose v6.2.1

.eslintrc

@@ -94,6 +94,7 @@ rules:
   assert-fail-single-argument: 2
   new-with-error: [2, "Error", "RangeError", "TypeError", "SyntaxError", "ReferenceError"]
   no-deepEqual: 2
+  no-definegetter-definesetter: 2
 
 # Global scoped method and vars
 globals:

.github/ISSUE_TEMPLATE.md

@@ -6,11 +6,8 @@ Version: usually output of `node -v`
 Platform: either `uname -a` output, or if Windows, version and 32 or 64-bit
 Subsystem: if known, please specify affected core module name
 
-It will be much easier for us to fix the issue if a test case that reproduces
-the problem is provided. Ideally this test case should not have any external
-dependencies. We understand that it is not always possible to reduce your code
-to a small test case, but we would appreciate to have as
-much data as possible.
+If possible, please provide code that demonstrates the problem, keeping it as
+simple and free of external dependencies as you are able.
 -->
 
 * **Version**:

CHANGELOG.md

@@ -347,143 +347,143 @@ release.
 
 ## 2015-09-15, io.js Version 3.3.1 @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#3.3.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.3.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#3.3.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.3.1</a>.
 
 ## 2015-09-08, Version 4.0.0 (Stable), @rvagg
 
 <a href="doc/changelogs/CHANGELOG_V4.md#4.0.0>Moved to doc/changelogs/CHANGELOG_V6.md#6.0.0</a>.
 
 ## 2015-09-02, Version 3.3.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#3.3.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.3.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#3.3.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.3.0</a>.
 
 ## 2015-08-25, Version 3.2.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#3.2.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.2.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#3.2.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.2.0</a>.
 
 ## 2015-08-18, Version 3.1.0, @Fishrock123
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#3.1.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.1.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#3.1.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.1.0</a>.
 
 ## 2015-08-04, Version 3.0.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#3.0.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.0.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#3.0.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#3.0.0</a>.
 
 ## 2015-07-28, Version 2.5.0, @cjihrig
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.5.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.5.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.5.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.5.0</a>.
 
 ## 2015-07-17, Version 2.4.0, @Fishrock123
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.4.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.4.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.4.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.4.0</a>.
 
 ## 2015-07-09, Version 2.3.4, @Fishrock123
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.3.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.4</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.3.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.4</a>.
 
 ## 2015-07-09, Version 1.8.4, @Fishrock123
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.8.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.4</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.8.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.4</a>.
 
 ## 2015-07-09, Version 0.12.7 (Stable)
 
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.7">Moved to doc/changelogs/CHANGELOG_V012.md#0.12.7</a>.
 
 ## 2015-07-04, Version 2.3.3, @Fishrock123
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.3.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.3</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.3.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.3</a>.
 
 ## 2015-07-04, Version 1.8.3, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.8.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.3</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.8.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.3</a>.
 
 ## 2015-07-03, Version 0.12.6 (Stable)
 
-<a href="doc/changelogs/CHANGELOG_V010.md#0.12.6">Moved to doc/changelogs/CHANGELOG_V010.md#0.12.6</a>.
+<a href="doc/changelogs/CHANGELOG_V012.md#0.12.6">Moved to doc/changelogs/CHANGELOG_V012.md#0.12.6</a>.
 
 ## 2015-07-01, Version 2.3.2, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.3.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.2</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.3.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.2</a>.
 
 ## 2015-06-23, Version 2.3.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.3.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.3.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.1</a>.
 
 ## 2015-06-22, Version 0.12.5 (Stable)
 
-<a href="doc/changelogs/CHANGELOG_V010.md#0.12.5">Moved to doc/changelogs/CHANGELOG_V010.md#0.12.5</a>.
+<a href="doc/changelogs/CHANGELOG_V012.md#0.12.5">Moved to doc/changelogs/CHANGELOG_V012.md#0.12.5</a>.
 
 ## 2015-06-18, Version 0.10.39 (Maintenance)
 
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.39">Moved to doc/changelogs/CHANGELOG_V010.md#0.10.39</a>.
 
 ## 2015-06-13, Version 2.3.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.3.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.3.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.3.0</a>.
 
 ## 2015-06-01, Version 2.2.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.2.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.2.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.2.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.2.1</a>.
 
 ## 2015-05-31, Version 2.2.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.2.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.2.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.2.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.2.0</a>.
 
 ## 2015-05-24, Version 2.1.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.1.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.1.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.1.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.1.0</a>.
 
 ## 2015-05-22, Version 0.12.4 (Stable)
 
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.4">Moved to doc/changelogs/CHANGELOG_V012.md#0.12.4</a>.
 
 ## 2015-05-17, Version 1.8.2, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.8.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.2</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.8.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.2</a>.
 
 ## 2015-05-15, Version 2.0.2, @Fishrock123
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.0.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.0.2</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.0.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.0.2</a>.
 
 ## 2015-05-13, Version 0.12.3 (Stable)
 
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.3">Moved to doc/changelogs/CHANGELOG_V012.md#0.12.3</a>.
 
 ## 2015-05-07, Version 2.0.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.0.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.0.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.0.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.0.1</a>.
 
 ## 2015-05-04, Version 2.0.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#2.0.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.0.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#2.0.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#2.0.0</a>.
 
 ## 2015-04-20, Version 1.8.1, @chrisdickinson
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.8.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.8.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.8.1</a>.
 
 ## 2015-04-14, Version 1.7.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.7.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.7.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.7.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.7.1</a>.
 
 ## 2015-04-14, Version 1.7.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.7.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.7.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.7.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.7.0</a>.
 
 ## 2015-04-06, Version 1.6.4, @Fishrock123
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.6.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.4</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.6.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.4</a>.
 
 ## 2015-03-31, Version 1.6.3, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.6.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.3</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.6.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.3</a>.
 
 ## 2015-03-31, Version 0.12.2 (Stable)
 
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.2">Moved to doc/changelogs/CHANGELOG_V012.md#0.12.2</a>.
 
 ## 2015-03-23, Version 1.6.2, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.6.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.2</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.6.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.2</a>.
 
 ## 2015-03-23, Version 0.12.1 (Stable)
 
@@ -495,71 +495,71 @@ release.
 
 ## 2015-03-20, Version 1.6.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.6.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.6.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.1</a>.
 
 ## 2015-03-19, Version 1.6.0, @chrisdickinson
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.6.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.6.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.6.0</a>.
 
 ## 2015-03-11, Version 0.10.37 (Maintenance)
 
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.37">Moved to doc/changelogs/CHANGELOG_V010.md#0.10.37</a>.
 
 ## 2015-03-09, Version 1.5.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.5.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.5.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.5.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.5.1</a>.
 
 ## 2015-03-06, Version 1.5.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.5.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.5.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.5.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.5.0</a>.
 
 ## 2015-03-02, Version 1.4.3, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.4.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.4.3</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.4.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.4.3</a>.
 
 ## 2015-02-28, Version 1.4.2, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.4.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.4.2</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.4.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.4.2</a>.
 
 ## 2015-02-26, Version 1.4.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.4.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.4.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.4.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.4.1</a>.
 
 ## 2015-02-20, Version 1.3.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.3.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.3.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.3.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.3.0</a>.
 
 ## 2015-02-10, Version 1.2.0, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.2.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.2.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.2.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.2.0</a>.
 
 ## 2015-02-06, Version 0.12.0 (Stable)
 
 <a href="doc/changelogs/CHANGELOG_V012.md#0.12.0">Moved to doc/changelogs/CHANGELOG_V012.md#0.12.0</a>.
 
 ## 2015-02-03, Version 1.1.0, @chrisdickinson
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.1.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.1.0</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.1.0">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.1.0</a>.
 
 ## 2015-01-26, Version 0.10.36 (Stable)
 
 <a href="doc/changelogs/CHANGELOG_V010.md#0.10.36">Moved to doc/changelogs/CHANGELOG_V010.md#0.10.36</a>.
 
 ## 2015-01-24, Version 1.0.4, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.0.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.4</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.0.4">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.4</a>.
 
 ## 2015-01-20, Version 1.0.3, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.0.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.3</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.0.3">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.3</a>.
 
 ## 2015-01-16, Version 1.0.2, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.0.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.2</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.0.2">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.2</a>.
 
 ## 2015-01-14, Version 1.0.1, @rvagg
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#1.0.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.1</a>.
+<a href="doc/changelogs/CHANGELOG_IOJS.md#1.0.1">Moved to doc/changelogs/CHANGELOG_IOJS.md#1.0.1</a>.
 
 ## 2014.09.24, Version 0.11.14 (Unstable)
 
@@ -731,7 +731,7 @@ release.
 
 ## 2013.05.24, Version 0.10.8 (Stable)
 
-<a href="doc/changelogs/CHANGELOG_V6.md#0.10.8">Moved to doc/changelogs/CHANGELOG_V6.md#0.10.8</a>.
+<a href="doc/changelogs/CHANGELOG_V010.md#0.10.8">Moved to doc/changelogs/CHANGELOG_V010.md#0.10.8</a>.
 
 ## 2013.05.17, Version 0.10.7 (Stable)
 
@@ -843,7 +843,7 @@ release.
 
 ## 2013.02.06, Version 0.8.19 (Stable)
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#0.8.29">Moved to doc/changelogs/CHANGELOG_ARCHIVE.md#0.8.29</a>.
+<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#0.8.19">Moved to doc/changelogs/CHANGELOG_ARCHIVE.md#0.8.19</a>.
 
 ## 2013.01.18, Version 0.8.18 (Stable)
 
@@ -1299,7 +1299,7 @@ release.
 
 ## 2009.12.19, Version 0.1.22
 
-<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#01.1.22">Moved to doc/changelogs/CHANGELOG_ARCHIVE.md#01.1.22</a>.
+<a href="doc/changelogs/CHANGELOG_ARCHIVE.md#0.1.22">Moved to doc/changelogs/CHANGELOG_ARCHIVE.md#0.1.22</a>.
 
 ## 2009.12.06, Version 0.1.21
 

CODE_OF_CONDUCT.md

@@ -12,7 +12,7 @@
   all.
 * Please be kind and courteous. There's no need to be mean or rude.
 * Respect that some individuals and cultures consider the casual use of
-  profanity offensive and off-putting.
+  profanity and sexualized language offensive and off-putting.
 * Respect that people have differences of opinion and that every
   design or implementation choice carries a trade-off and numerous
   costs. There is seldom a right answer.

CONTRIBUTING.md

@@ -133,8 +133,9 @@ $ git rebase upstream/master
 ### Step 5: Test
 
 Bug fixes and features **should come with tests**. Add your tests in the
-test/parallel/ directory. Look at other tests to see how they should be
-structured (license boilerplate, common includes, etc.).
+`test/parallel/` directory. For guidance on how to write a test for the Node.js
+project, see this [guide](./doc/guides/writing_tests.md). Looking at other tests
+to see how they should be structured can also help.
 
 ```text
 $ ./configure && make -j8 test

Makefile

@@ -118,7 +118,7 @@ test: all
 	$(MAKE) build-addons
 	$(MAKE) cctest
 	$(PYTHON) tools/test.py --mode=release -J \
-		addon doctool known_issues message parallel sequential
+		addon doctool known_issues message pseudo-tty parallel sequential
 	$(MAKE) lint
 
 test-parallel: all
@@ -144,7 +144,10 @@ ADDONS_BINDING_GYPS := \
 		$(wildcard test/addons/*/binding.gyp))
 
 # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
-test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) \
+# Depends on node-gyp package.json so that build-addons is (re)executed when
+# node-gyp is updated as part of an npm update.
+test/addons/.buildstamp: deps/npm/node_modules/node-gyp/package.json \
+	$(ADDONS_BINDING_GYPS) \
 	deps/uv/include/*.h deps/v8/include/*.h \
 	src/node.h src/node_buffer.h src/node_object_wrap.h \
 	test/addons/.docbuildstamp
@@ -163,7 +166,7 @@ test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) \
 # if the subprocess touched anything so it pessimistically assumes that
 # .buildstamp and .docbuildstamp are out of date and need a rebuild.
 # Just goes to show that recursive make really is harmful...
-# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.
+# TODO(bnoordhuis) Force rebuild after gyp update.
 build-addons: $(NODE_EXE) test/addons/.buildstamp
 
 test-gc: all test/gc/node_modules/weak/build/Release/weakref.node
@@ -180,7 +183,8 @@ test-all-valgrind: test-build
 test-ci: | build-addons
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
 		--mode=release --flaky-tests=$(FLAKY_TESTS) \
-		$(TEST_CI_ARGS) addons doctool known_issues message parallel sequential
+		$(TEST_CI_ARGS) addons doctool known_issues message pseudo-tty parallel \
+		sequential
 
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release
@@ -275,11 +279,15 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
 out/doc/%: doc/%
 	cp -r $< $@
 
+# check if ./node is actually set, else use user pre-installed binary
+gen-json = tools/doc/generate.js --format=json $< > $@
 out/doc/api/%.json: doc/api/%.md
-	$(NODE) tools/doc/generate.js --format=json $< > $@
+	[ -x $(NODE) ] && $(NODE) $(gen-json) || node $(gen-json)
 
+# check if ./node is actually set, else use user pre-installed binary
+gen-html = tools/doc/generate.js --node-version=$(FULLVERSION) --format=html --template=doc/template.html $< > $@
 out/doc/api/%.html: doc/api/%.md
-	$(NODE) tools/doc/generate.js --node-version=$(FULLVERSION) --format=html --template=doc/template.html $< > $@
+	[ -x $(NODE) ] && $(NODE) $(gen-html) || node $(gen-html)
 
 docopen: out/doc/api/all.html
 	-google-chrome out/doc/api/all.html