From badf357e4d6c6722344f7125d6a262860645ead7 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Thu, 27 Aug 2015 16:28:59 -0700
Subject: [PATCH 1/3] properly register a binding when pushing it to the scope

---
 packages/babel/src/traversal/scope/index.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/babel/src/traversal/scope/index.js b/packages/babel/src/traversal/scope/index.js
index bd654df9ab..012389bc35 100644
--- a/packages/babel/src/traversal/scope/index.js
+++ b/packages/babel/src/traversal/scope/index.js
@@ -830,21 +830,22 @@ export default class Scope {
     var blockHoist = opts._blockHoist == null ? 2 : opts._blockHoist;
 
     var dataKey = `declaration:${kind}:${blockHoist}`;
-    var declar  = !unique && path.getData(dataKey);
+    var declarPath  = !unique && path.getData(dataKey);
 
-    if (!declar) {
-      declar = t.variableDeclaration(kind, []);
+    if (!declarPath) {
+      var declar = t.variableDeclaration(kind, []);
       declar._generated = true;
       declar._blockHoist = blockHoist;
 
       this.hub.file.attachAuxiliaryComment(declar);
 
-      var [declarPath] = path.unshiftContainer("body", [declar]);
-      this.registerBinding(kind, declarPath);
-      if (!unique) path.setData(dataKey, declar);
+      [declarPath] = path.unshiftContainer("body", [declar]);
+      if (!unique) path.setData(dataKey, declarPath);
     }
 
-    declar.declarations.push(t.variableDeclarator(opts.id, opts.init));
+    var declarator = t.variableDeclarator(opts.id, opts.init);
+    declarPath.node.declarations.push(declarator);
+    this.registerBinding(kind, declarPath.get("declarations").pop());
   }
 
   /**

From dea4c0dd5a3e1e86f84de894f3b601f0a560b157 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Thu, 27 Aug 2015 16:37:53 -0700
Subject: [PATCH 2/3] update boostrap script to ignore packages with no
 package.json

---
 scripts/bootstrap.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
index b90eff3339..13c1764d9a 100755
--- a/scripts/bootstrap.js
+++ b/scripts/bootstrap.js
@@ -10,14 +10,17 @@ exec("npm list --global --depth 1 babel >/dev/null 2>&1 && npm uninstall -g babe
 var packages = [];
 ls("packages/*").forEach(function (loc) {
   var name = path.basename(loc);
-  if (name[0] !== ".") {
-    var pkg = require("../packages/" + name + "/package.json");
-    packages.push({
-      folder: name,
-      pkg: pkg,
-      name: pkg.name
-    });
-  }
+  if (name[0] === ".") return;
+
+  var pkgLoc = __dirname + "/../packages/" + name + "/package.json";
+  if (!fs.existsSync(pkgLoc)) return;
+
+  var pkg = require(pkgLoc);
+  packages.push({
+    folder: name,
+    pkg: pkg,
+    name: pkg.name
+  });
 });
 
 // create links

From 442f1173d267299296924777352b58b6646525b6 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Thu, 27 Aug 2015 16:38:34 -0700
Subject: [PATCH 3/3] v5.8.23

---
 VERSION                         | 2 +-
 packages/babel-cli/package.json | 2 +-
 packages/babel/package.json     | 4 ++--
 packages/babylon/package.json   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 694a2b5eb3..aaeac54d59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.8.22
\ No newline at end of file
+5.8.23
\ No newline at end of file
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
index df57a1005a..00ed33de06 100644
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel",
-  "version": "5.8.21",
+  "version": "5.8.23",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
diff --git a/packages/babel/package.json b/packages/babel/package.json
index a308a5128a..6999cd2b77 100644
--- a/packages/babel/package.json
+++ b/packages/babel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-core",
-  "version": "5.8.22",
+  "version": "5.8.23",
   "description": "A compiler for writing next generation JavaScript",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -42,7 +42,7 @@
     "babel-plugin-runtime": "^1.0.7",
     "babel-plugin-undeclared-variables-check": "^1.0.2",
     "babel-plugin-undefined-to-void": "^1.1.6",
-    "babylon": "^5.8.22",
+    "babylon": "^5.8.23",
     "bluebird": "^2.9.33",
     "chalk": "^1.0.0",
     "convert-source-map": "^1.1.0",
diff --git a/packages/babylon/package.json b/packages/babylon/package.json
index 0da5690336..32b7162915 100644
--- a/packages/babylon/package.json
+++ b/packages/babylon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babylon",
-  "version": "5.8.22",
+  "version": "5.8.23",
   "description": "",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",