Merge remote-tracking branch 'nodejs/master' into xplat

Merge nodejs/node@b394cf3 as of 03-08-2017

PR-URL: #183
Reviewed-By: Hitesh Kanwathirtha <hiteshk@microsoft.com>

CHANGELOG.md

@@ -28,7 +28,10 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V7.md#7.6.0">7.6.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V7.md#7.7.2">7.7.2</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.7.1">7.7.1</a><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.7.0">7.7.0</a><br/>
+<a href="doc/changelogs/CHANGELOG_V7.md#7.6.0">7.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V7.md#7.5.0">7.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V7.md#7.4.0">7.4.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V7.md#7.3.0">7.3.0</a><br/>

CONTRIBUTING.md

@@ -46,15 +46,6 @@ $ git remote add upstream git://github.com/nodejs/node.git
 For developing new features and bug fixes, the `master` branch should be pulled
 and built upon.
 
-#### Respect the stability index
-
-The rules for the master branch are less strict; consult the
-[stability index](./doc/api/documentation.md#stability-index) for details.
-
-In a nutshell, modules are at varying levels of API stability. Bug fixes are
-always welcome but API or behavioral changes to modules at stability level 3
-(Locked) are off-limits.
-
 #### Dependencies
 
 Node.js has several bundled dependencies in the *deps/* and the *tools/*

Makefile

@@ -358,6 +358,11 @@ test-npm-publish: $(NODE_EXE)
 test-addons: test-build
 	$(PYTHON) tools/test.py --mode=release addons
 
+test-addons-clean:
+	$(RM) -rf test/addons/??_*/
+	$(RM) -rf test/addons/*/build
+	$(RM) test/addons/.buildstamp test/addons/.docbuildstamp
+
 test-timers:
 	$(MAKE) --directory=tools faketime
 	$(PYTHON) tools/test.py --mode=release timers
@@ -857,10 +862,11 @@ endif
 
 .PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
 	check uninstall install install-includes install-bin all staticlib \
-	dynamiclib test test-all test-addons build-addons website-upload pkg \
-	blog blogclean tar binary release-only bench-http-simple bench-idle \
-	bench-all bench bench-misc bench-array bench-buffer bench-net \
-	bench-http bench-fs bench-tls cctest run-ci test-v8 test-v8-intl \
-	test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci doc-only \
-	$(TARBALL)-headers test-ci test-ci-native test-ci-js build-ci clear-stalled \
-	coverage-clean coverage-build coverage-test coverage list-gtests
+	dynamiclib test test-all test-addons test-addons-clean build-addons \
+	website-upload pkg blog blogclean tar binary release-only \
+	bench-http-simple bench-idle bench-all bench bench-misc bench-array \
+	bench-buffer bench-net bench-http bench-fs bench-tls cctest run-ci test-v8 \
+	test-v8-intl test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci \
+	doc-only $(TARBALL)-headers test-ci test-ci-native test-ci-js build-ci \
+	clear-stalled coverage-clean coverage-build coverage-test coverage \
+	list-gtests