Merge branch 'master' into update-deps

TheLarkInn · web-flow · commit 8d8a7f282203 · 2016-10-27T08:19:24.000-05:00
diff --git a/test/cases/parsing/harmony-export-precedence/a.js b/test/cases/parsing/harmony-export-precedence/a.js
@@ -1,5 +1,5 @@
 export function a() { return "a1"; }
-export { a, b } from "./b";
+export { b } from "./b";
 export * from "./c";
-export { d, e } from "./b";
+export { d } from "./b";
 export var e = "e1";
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -1,2 +1,3 @@
 --full-trace
 --reporter dot
+--globals addresses
