meta: merge node/master into node-chakracore/master

Merge ac829f0 as of 2018-02-06
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>

Makefile

@@ -1186,6 +1186,7 @@ lint: ## Run JS, C++, MD and doc linters.
 	$(MAKE) lint-js || EXIT_STATUS=$$? ; \
 	$(MAKE) lint-cpp || EXIT_STATUS=$$? ; \
 	$(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \
+	$(MAKE) lint-md || EXIT_STATUS=$$? ; \
 	exit $$EXIT_STATUS
 CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
 

benchmark/fs/bench-stat-promise.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const common = require('../common');
+const fs = require('fs');
+
+const bench = common.createBenchmark(main, {
+  n: [20e4],
+  statType: ['fstat', 'lstat', 'stat']
+});
+
+async function run(n, statType) {
+  const arg = statType === 'fstat' ?
+    await fs.promises.open(__filename, 'r') : __filename;
+  let remaining = n;
+  bench.start();
+  while (remaining-- > 0)
+    await fs.promises[statType](arg);
+  bench.end(n);
+
+  if (typeof arg.close === 'function')
+    await arg.close();
+}
+
+function main(conf) {
+  const n = conf.n >>> 0;
+  const statType = conf.statType;
+  run(n, statType).catch(console.log);
+}

doc/api/deprecations.md

@@ -840,31 +840,32 @@ Assigning properties to the top-level `this` as an alternative
 to `module.exports` is deprecated. Developers should use `exports`
 or `module.exports` instead.
 
-### DEP00XX: crypto.fips is deprecated and replaced.
+<a id="DEP0093"></a>
+### DEP0093: crypto.fips is deprecated and replaced.
 
 Type: Documentation-only
 
 The [`crypto.fips`][] property is deprecated. Please use `crypto.setFips()`
 and `crypto.getFips()` instead.
 
-<a id="DEP0XX"></a>
-### DEP0XXX: Using `assert.fail()` with more than one argument.
+<a id="DEP0094"></a>
+### DEP0094: Using `assert.fail()` with more than one argument.
 
 Type: Runtime
 
 Using `assert.fail()` with more than one argument has no benefit over writing an
 individual error message. Either use `assert.fail()` with one argument or switch
 to one of the other assert methods.
 
-<a id="DEP00XX"></a>
-### DEP00XX: timers.enroll()
+<a id="DEP0095"></a>
+### DEP0095: timers.enroll()
 
 Type: Runtime
 
 `timers.enroll()` is deprecated. Please use the publicly documented [`setTimeout()`][] or [`setInterval()`][] instead.
 
-<a id="DEP00XX"></a>
-### DEP00XX: timers.unenroll()
+<a id="DEP0096"></a>
+### DEP0096: timers.unenroll()
 
 Type: Runtime