diff --git a/.travis.yml b/.travis.yml
index 92b900ef7f..fb09487bc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,11 @@ cache:
   - node_modules
 
 node_js:
+ - stable
  - "4.0"
  - iojs
  - "0.10"
  - "0.12"
- - "stable"
 
 script: make test-travis
 after_success:
diff --git a/doc/design/compiler-environment-support.md b/doc/design/compiler-environment-support.md
new file mode 100644
index 0000000000..4a85e9d3df
--- /dev/null
+++ b/doc/design/compiler-environment-support.md
@@ -0,0 +1,15 @@
+# Compiler environment support
+
+The Babel compiler is **only** supported in these environments:
+
+ - Modern browsers such as Chrome, Firefox, Safari, Edge etc.
+ - Node 0.10+
+
+This means that notably Babel does not support the following environments:
+
+ - Rhino
+ - Nashorn
+ - Internet Explorer
+ - ...
+
+**NOTE:** Compiler support does not dictate the runtime requirements of compiled code.
diff --git a/doc/design/compiler-guarantees.md b/doc/design/compiler-guarantees.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/babel-cli/src/babel-doctor/rules/latest-packages.js b/packages/babel-cli/src/babel-doctor/rules/latest-packages.js
index c91577931b..ddea4a2efa 100644
--- a/packages/babel-cli/src/babel-doctor/rules/latest-packages.js
+++ b/packages/babel-cli/src/babel-doctor/rules/latest-packages.js
@@ -39,6 +39,9 @@ export default async function (packages) {
     let info = infos[i];
     let pkg = filteredPackages[i];
 
+    // https://github.com/babel/babel/issues/2915
+    if (pkg.name === "babel-runtime") continue;
+
     if (info.version !== pkg.version) {
       messages.push(`${pkg.name} - Latest is ${info.version}. Local version is ${pkg.version}`);
     }
diff --git a/packages/babel-core/src/transformation/file/index.js b/packages/babel-core/src/transformation/file/index.js
index 9257f8f882..8871182bf6 100644
--- a/packages/babel-core/src/transformation/file/index.js
+++ b/packages/babel-core/src/transformation/file/index.js
@@ -453,11 +453,7 @@ export default class File extends Store {
 
       if (err.stack) {
         let newStack = err.stack.replace(err.message, message);
-        try {
-          err.stack = newStack;
-        } catch (e) {
-          // `err.stack` may be a readonly property in some environments
-        }
+        err.stack = newStack;
       }
 
       throw err;