ember-source 2.7.2 → 2.8.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7cb532fe97a500488f281fa6de36d58a302ecc0
-  data.tar.gz: 39e3884b3e7ac287e86a9b04316cbeb106c9f08b
+  metadata.gz: ce9c9d778331b0fad53093b38c255df044a73634
+  data.tar.gz: 67ad6c615d1d46ca7c41e520c2347b6d93e0512b
 SHA512:
-  metadata.gz: 9b80874624573b4f8b4181ce832a5678ed4d43c579a99c24023ffcb12dcedea8021d47030f398ee9b53844687c7ebf71d559e60d143c87895aaea414210773c6
-  data.tar.gz: ee07938ec87b7fc4b116c2ce0227309e6260f123be0c3b3866a327c2eb18f7aaa4e7aacdfa3570c26e8734fe5446da4c874bfc876f342244d5c649e66cb3adad
+  metadata.gz: 14bcf07fc942da57fe2d92d99fe25589e3f4791fb81febf23059f0ba6b7026d0878d2ce993d5fe71ef3992bccb1a60f06cbccc7ea21395714945f2bd84a717a9
+  data.tar.gz: d2fdc4dc023657db5d1ccf792317dd3ff353066287359f492a751faa9ba52baea04e78621e92d03884b154e75d9ec089003a8a993154e1f8204d4d694fab6fd7

data/VERSION

@@ -1 +1 @@
-2.7.2
+2.8.0-beta.1

data/dist/ember-runtime.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.7.2
+ * @version   2.8.0-beta.1
  */
 
 var enifed, requireModule, require, Ember;
@@ -1156,6 +1156,8 @@ enifed('backburner/utils', ['exports'], function (exports) {
 enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debug', 'ember-metal/dictionary', 'container/owner', 'ember-runtime/mixins/container_proxy', 'ember-metal/symbol'], function (exports, _emberEnvironment, _emberMetalDebug, _emberMetalDictionary, _containerOwner, _emberRuntimeMixinsContainer_proxy, _emberMetalSymbol) {
   'use strict';
 
+  exports.default = Container;
+
   var CONTAINER_OVERRIDE = _emberMetalSymbol.default('CONTAINER_OVERRIDE');
 
   /**
@@ -1171,6 +1173,7 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
    @private
    @class Container
    */
+
   function Container(registry, options) {
     this.registry = registry;
     this.owner = options && options.owner ? options.owner : null;
@@ -1179,6 +1182,7 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
     this.validationCache = _emberMetalDictionary.default(options && options.validationCache ? options.validationCache : null);
     this._fakeContainerToInject = _emberRuntimeMixinsContainer_proxy.buildFakeContainerWithDeprecations(this);
     this[CONTAINER_OVERRIDE] = undefined;
+    this.isDestroyed = false;
   }
 
   Container.prototype = {
@@ -1224,23 +1228,23 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
      The singleton is scoped to the container, allowing multiple containers
      to all have their own locally scoped singletons.
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       registry.register('api:twitter', Twitter);
-      var twitter = container.lookup('api:twitter');
+      let twitter = container.lookup('api:twitter');
       twitter instanceof Twitter; // => true
       // by default the container will return singletons
-     var twitter2 = container.lookup('api:twitter');
+     let twitter2 = container.lookup('api:twitter');
      twitter2 instanceof Twitter; // => true
       twitter === twitter2; //=> true
      ```
       If singletons are not wanted, an optional flag can be provided at lookup.
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       registry.register('api:twitter', Twitter);
-      var twitter = container.lookup('api:twitter', { singleton: false });
-     var twitter2 = container.lookup('api:twitter', { singleton: false });
+      let twitter = container.lookup('api:twitter', { singleton: false });
+     let twitter2 = container.lookup('api:twitter', { singleton: false });
       twitter === twitter2; //=> false
      ```
       @private
@@ -1360,7 +1364,7 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
     if (arguments.length > 1) {
       var container = arguments[0];
       var injections = [];
-      var injection;
+      var injection = undefined;
 
       for (var i = 1; i < arguments.length; i++) {
         if (arguments[i]) {
@@ -1370,7 +1374,7 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
 
       container.registry.validateInjections(injections);
 
-      for (i = 0; i < injections.length; i++) {
+      for (var i = 0; i < injections.length; i++) {
         injection = injections[i];
         hash[injection.property] = lookup(container, injection.fullName);
         if (!isSingleton(container, injection.fullName)) {
@@ -1466,7 +1470,8 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
 
   function instantiate(container, fullName) {
     var factory = factoryFor(container, fullName);
-    var lazyInjections, validationCache;
+    var lazyInjections = undefined,
+        validationCache = undefined;
 
     if (container.registry.getOption(fullName, 'instantiate') === false) {
       return factory;
@@ -1474,7 +1479,7 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
 
     if (factory) {
       if (typeof factory.create !== 'function') {
-        throw new Error('Failed to create an instance of \'' + fullName + '\'. ' + 'Most likely an improperly defined class or an invalid module export.');
+        throw new Error('Failed to create an instance of \'' + fullName + '\'. Most likely an improperly defined class or' + ' an invalid module export.');
       }
 
       validationCache = container.validationCache;
@@ -1542,11 +1547,10 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
   function eachDestroyable(container, callback) {
     var cache = container.cache;
     var keys = Object.keys(cache);
-    var key, value;
 
     for (var i = 0; i < keys.length; i++) {
-      key = keys[i];
-      value = cache[key];
+      var key = keys[i];
+      var value = cache[key];
 
       if (container.registry.getOption(key, 'instantiate') !== false) {
         callback(value);
@@ -1577,8 +1581,6 @@ enifed('container/container', ['exports', 'ember-environment', 'ember-metal/debu
       }
     }
   }
-
-  exports.default = Container;
 });
 enifed('container/index', ['exports', 'container/registry', 'container/container', 'container/owner'], function (exports, _containerRegistry, _containerContainer, _containerOwner) {
   /*
@@ -1642,9 +1644,10 @@ enifed('container/owner', ['exports', 'ember-metal/symbol'], function (exports,
     ```
   
     @method getOwner
+    @for Ember
     @param {Object} object An object with an owner.
     @return {Object} An owner object.
-    @for Ember
+    @since 2.3.0
     @public
   */
 
@@ -1657,9 +1660,10 @@ enifed('container/owner', ['exports', 'ember-metal/symbol'], function (exports,
     useful in some testing cases.
   
     @method setOwner
+    @for Ember
     @param {Object} object An object with an owner.
     @return {Object} An owner object.
-    @for Ember
+    @since 2.3.0
     @public
   */
 
@@ -1670,6 +1674,7 @@ enifed('container/owner', ['exports', 'ember-metal/symbol'], function (exports,
 enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dictionary', 'ember-metal/empty_object', 'ember-metal/assign', 'container/container', 'ember-metal/utils'], function (exports, _emberMetalDebug, _emberMetalDictionary, _emberMetalEmpty_object, _emberMetalAssign, _containerContainer, _emberMetalUtils) {
   'use strict';
 
+  exports.default = Registry;
   exports.privatize = privatize;
 
   var VALID_FULL_NAME_REGEXP = /^[^:]+:[^:]+$/;
@@ -1687,6 +1692,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
    @class Registry
    @since 1.11.0
   */
+
   function Registry(options) {
     this.fallback = options && options.fallback ? options.fallback : null;
 
@@ -1809,7 +1815,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
      Registers a factory for later injection.
       Example:
       ```javascript
-     var registry = new Registry();
+     let registry = new Registry();
       registry.register('model:user', Person, {singleton: false });
      registry.register('fruit:favorite', Orange);
      registry.register('communication:main', Email, {singleton: false});
@@ -1826,13 +1832,13 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
       _emberMetalDebug.assert('fullName must be a proper full name', this.validateFullName(fullName));
 
       if (factory === undefined) {
-        throw new TypeError('Attempting to register an unknown factory: `' + fullName + '`');
+        throw new TypeError('Attempting to register an unknown factory: \'' + fullName + '\'');
       }
 
       var normalizedName = this.normalize(fullName);
 
       if (this._resolveCache[normalizedName]) {
-        throw new Error('Cannot re-register: `' + fullName + '`, as it has already been resolved.');
+        throw new Error('Cannot re-register: \'' + fullName + '\', as it has already been resolved.');
       }
 
       delete this._failCache[normalizedName];
@@ -1843,7 +1849,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
     /**
      Unregister a fullName
       ```javascript
-     var registry = new Registry();
+     let registry = new Registry();
      registry.register('model:user', User);
       registry.resolve('model:user').create() instanceof User //=> true
       registry.unregister('model:user')
@@ -1871,7 +1877,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
       By default `resolve` will retrieve the factory from
      the registry.
       ```javascript
-     var registry = new Registry();
+     let registry = new Registry();
      registry.register('api:twitter', Twitter);
       registry.resolve('api:twitter') // => Twitter
      ```
@@ -1880,7 +1886,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
      the opportunity to resolve the fullName, otherwise it will fallback
      to the registry.
       ```javascript
-     var registry = new Registry();
+     let registry = new Registry();
      registry.resolver = function(fullName) {
         // lookup via the module system of choice
       };
@@ -1994,17 +2000,17 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
     /**
      Allow registering options for all factories of a type.
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       // if all of type `connection` must not be singletons
      registry.optionsForType('connection', { singleton: false });
       registry.register('connection:twitter', TwitterConnection);
      registry.register('connection:facebook', FacebookConnection);
-      var twitter = container.lookup('connection:twitter');
-     var twitter2 = container.lookup('connection:twitter');
+      let twitter = container.lookup('connection:twitter');
+     let twitter2 = container.lookup('connection:twitter');
       twitter === twitter2; // => false
-      var facebook = container.lookup('connection:facebook');
-     var facebook2 = container.lookup('connection:facebook');
+      let facebook = container.lookup('connection:facebook');
+     let facebook2 = container.lookup('connection:facebook');
       facebook === facebook2; // => false
      ```
       @private
@@ -2040,6 +2046,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
     getOptions: function (fullName) {
       var normalizedName = this.normalize(fullName);
       var options = this._options[normalizedName];
+
       if (options === undefined && this.fallback) {
         options = this.fallback.getOptions(fullName);
       }
@@ -2071,14 +2078,14 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
       For example, provided each object of type `controller` needed a `router`.
      one would do the following:
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       registry.register('router:main', Router);
      registry.register('controller:user', UserController);
      registry.register('controller:post', PostController);
       registry.typeInjection('controller', 'router', 'router:main');
-      var user = container.lookup('controller:user');
-     var post = container.lookup('controller:post');
+      let user = container.lookup('controller:user');
+     let post = container.lookup('controller:post');
       user.router instanceof Router; //=> true
      post.router instanceof Router; //=> true
       // both controllers share the same router
@@ -2095,7 +2102,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
 
       var fullNameType = fullName.split(':')[0];
       if (fullNameType === type) {
-        throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s).');
+        throw new Error('Cannot inject a \'' + fullName + '\' on other ' + type + '(s).');
       }
 
       var injections = this._typeInjections[type] || (this._typeInjections[type] = []);
@@ -2115,8 +2122,8 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
      * Injecting one fullName on a type
       Example:
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       registry.register('source:main', Source);
      registry.register('model:user', User);
      registry.register('model:post', Post);
@@ -2125,8 +2132,8 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
      registry.injection('model:user', 'post', 'model:post');
       // injecting one fullName on another type
      registry.injection('model', 'source', 'source:main');
-      var user = container.lookup('model:user');
-     var post = container.lookup('model:post');
+      let user = container.lookup('model:user');
+     let post = container.lookup('model:post');
       user.source instanceof Source; //=> true
      post.source instanceof Source; //=> true
       user.post instanceof Post; //=> true
@@ -2166,11 +2173,11 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
       For example, provided each factory of type `model` needed a `store`.
      one would do the following:
       ```javascript
-     var registry = new Registry();
+     let registry = new Registry();
       registry.register('store:main', SomeStore);
       registry.factoryTypeInjection('model', 'store', 'store:main');
-      var store = registry.lookup('store:main');
-     var UserFactory = registry.lookupFactory('model:user');
+      let store = registry.lookup('store:main');
+     let UserFactory = registry.lookupFactory('model:user');
       UserFactory.store instanceof SomeStore; //=> true
      ```
       @private
@@ -2199,8 +2206,8 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
      * Injecting one fullName on a type
       Example:
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       registry.register('store:main', Store);
      registry.register('store:secondary', OtherStore);
      registry.register('model:user', User);
@@ -2209,9 +2216,9 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
      registry.factoryInjection('model', 'store', 'store:main');
       // injecting one fullName on another fullName
      registry.factoryInjection('model:post', 'secondaryStore', 'store:secondary');
-      var UserFactory = container.lookupFactory('model:user');
-     var PostFactory = container.lookupFactory('model:post');
-     var store = container.lookup('store:main');
+      let UserFactory = container.lookupFactory('model:user');
+     let PostFactory = container.lookupFactory('model:post');
+     let store = container.lookup('store:main');
       UserFactory.store instanceof Store; //=> true
      UserFactory.secondaryStore instanceof OtherStore; //=> false
       PostFactory.store instanceof Store; //=> true
@@ -2276,7 +2283,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
 
     validateFullName: function (fullName) {
       if (!this.isValidFullName(fullName)) {
-        throw new TypeError('Invalid Fullname, expected: `type:name` got: ' + fullName);
+        throw new TypeError('Invalid Fullname, expected: \'type:name\' got: ' + fullName);
       }
 
       return true;
@@ -2291,13 +2298,13 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
         return;
       }
 
-      var fullName;
+      var fullName = undefined;
 
       for (var i = 0; i < injections.length; i++) {
         fullName = injections[i].fullName;
 
         if (!this.has(fullName)) {
-          throw new Error('Attempting to inject an unknown injection: `' + fullName + '`');
+          throw new Error('Attempting to inject an unknown injection: \'' + fullName + '\'');
         }
       }
     },
@@ -2364,7 +2371,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
    fullName. Used to allow for local lookup.
   
    ```javascript
-   var registry = new Registry();
+   let registry = new Registry();
   
    // the twitter factory is added to the module system
    registry.expandLocalLookup('component:post-title', { source: 'template:post' }) // => component:post/post-title
@@ -2457,7 +2464,7 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
   }
 
   var privateNames = _emberMetalDictionary.default(null);
-  var privateSuffix = Math.floor(Math.random() * new Date()) + '';
+  var privateSuffix = '' + Math.random() + Date.now();
 
   function privatize(_ref) {
     var fullName = _ref[0];
@@ -2474,8 +2481,6 @@ enifed('container/registry', ['exports', 'ember-metal/debug', 'ember-metal/dicti
 
     return privateNames[fullName] = _emberMetalUtils.intern(type + ':' + rawName + '-' + privateSuffix);
   }
-
-  exports.default = Registry;
 });
 enifed('ember-console/index', ['exports', 'ember-environment'], function (exports, _emberEnvironment) {
   'use strict';
@@ -2866,10 +2871,10 @@ enifed("ember-metal/assign", ["exports"], function (exports) {
     Copy properties from a source object to a target object.
   
     ```javascript
-    var a = {first: 'Yehuda'};
-    var b = {last: 'Katz'};
-    var c = {company: 'Tilde Inc.'};
-    Ember.assign(a, b, c); // a === {first: 'Yehuda', last: 'Katz', company: 'Tilde Inc.'}, b === {last: 'Katz'}, c === {company: 'Tilde Inc.'}
+    var a = { first: 'Yehuda' };
+    var b = { last: 'Katz' };
+    var c = { company: 'Tilde Inc.' };
+    Ember.assign(a, b, c); // a === { first: 'Yehuda', last: 'Katz', company: 'Tilde Inc.' }, b === { last: 'Katz' }, c === { company: 'Tilde Inc.' }
     ```
   
     @method assign
@@ -3066,7 +3071,7 @@ enifed('ember-metal/binding', ['exports', 'ember-console', 'ember-environment',
 
       _emberMetalEvents.addListener(obj, 'willDestroy', this, 'disconnect');
 
-      fireDeprecations(obj, this._to, this._from, possibleGlobal, this._oneWay, !possibleGlobal && !this._oneWay);
+      fireDeprecations(possibleGlobal, this._oneWay, !possibleGlobal && !this._oneWay);
 
       this._readyToSync = true;
       this._fromObj = fromObj;
@@ -3175,23 +3180,22 @@ enifed('ember-metal/binding', ['exports', 'ember-console', 'ember-environment',
 
   };
 
-  function fireDeprecations(obj, toPath, fromPath, deprecateGlobal, deprecateOneWay, deprecateAlias) {
+  function fireDeprecations(deprecateGlobal, deprecateOneWay, deprecateAlias) {
     var deprecateGlobalMessage = '`Ember.Binding` is deprecated. Since you' + ' are binding to a global consider using a service instead.';
     var deprecateOneWayMessage = '`Ember.Binding` is deprecated. Since you' + ' are using a `oneWay` binding consider using a `readOnly` computed' + ' property instead.';
     var deprecateAliasMessage = '`Ember.Binding` is deprecated. Consider' + ' using an `alias` computed property instead.';
 
-    var objectInfo = 'The `' + toPath + '` property of `' + obj + '` is an `Ember.Binding` connected to `' + fromPath + '`, but ';
-    _emberMetalDebug.deprecate(objectInfo + deprecateGlobalMessage, !deprecateGlobal, {
+    _emberMetalDebug.deprecate(deprecateGlobalMessage, !deprecateGlobal, {
       id: 'ember-metal.binding',
       until: '3.0.0',
       url: 'http://emberjs.com/deprecations/v2.x#toc_ember-binding'
     });
-    _emberMetalDebug.deprecate(objectInfo + deprecateOneWayMessage, !deprecateOneWay, {
+    _emberMetalDebug.deprecate(deprecateOneWayMessage, !deprecateOneWay, {
       id: 'ember-metal.binding',
       until: '3.0.0',
       url: 'http://emberjs.com/deprecations/v2.x#toc_ember-binding'
     });
-    _emberMetalDebug.deprecate(objectInfo + deprecateAliasMessage, !deprecateAlias, {
+    _emberMetalDebug.deprecate(deprecateAliasMessage, !deprecateAlias, {
       id: 'ember-metal.binding',
       until: '3.0.0',
       url: 'http://emberjs.com/deprecations/v2.x#toc_ember-binding'
@@ -3384,39 +3388,40 @@ enifed('ember-metal/binding', ['exports', 'ember-console', 'ember-environment',
 enifed('ember-metal/cache', ['exports', 'ember-metal/empty_object'], function (exports, _emberMetalEmpty_object) {
   'use strict';
 
-  exports.default = Cache;
+  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
 
-  function Cache(limit, func) {
-    this.store = new _emberMetalEmpty_object.default();
-    this.size = 0;
-    this.misses = 0;
-    this.hits = 0;
-    this.limit = limit;
-    this.func = func;
-  }
+  var Cache = (function () {
+    function Cache(limit, func, key, store) {
+      _classCallCheck(this, Cache);
 
-  var UNDEFINED = function () {};
+      this.size = 0;
+      this.misses = 0;
+      this.hits = 0;
+      this.limit = limit;
+      this.func = func;
+      this.key = key;
+      this.store = store || new DefaultStore();
+    }
 
-  Cache.prototype = {
-    set: function (key, value) {
+    Cache.prototype.set = function set(obj, value) {
       if (this.limit > this.size) {
+        var key = this.key === undefined ? obj : this.key(obj);
         this.size++;
         if (value === undefined) {
-          this.store[key] = UNDEFINED;
+          this.store.set(key, UNDEFINED);
         } else {
-          this.store[key] = value;
+          this.store.set(key, value);
         }
       }
-
       return value;
-    },
-
-    get: function (key) {
-      var value = this.store[key];
+    };
 
+    Cache.prototype.get = function get(obj) {
+      var key = this.key === undefined ? obj : this.key(obj);
+      var value = this.store.get(key);
       if (value === undefined) {
         this.misses++;
-        value = this.set(key, this.func(key));
+        value = this.set(key, this.func(obj));
       } else if (value === UNDEFINED) {
         this.hits++;
         value = undefined;
@@ -3426,15 +3431,43 @@ enifed('ember-metal/cache', ['exports', 'ember-metal/empty_object'], function (e
       }
 
       return value;
-    },
+    };
 
-    purge: function () {
-      this.store = new _emberMetalEmpty_object.default();
+    Cache.prototype.purge = function purge() {
+      this.store.clear();
       this.size = 0;
       this.hits = 0;
       this.misses = 0;
+    };
+
+    return Cache;
+  })();
+
+  exports.default = Cache;
+
+  function UNDEFINED() {}
+
+  var DefaultStore = (function () {
+    function DefaultStore() {
+      _classCallCheck(this, DefaultStore);
+
+      this.data = new _emberMetalEmpty_object.default();
     }
-  };
+
+    DefaultStore.prototype.get = function get(key) {
+      return this.data[key];
+    };
+
+    DefaultStore.prototype.set = function set(key, value) {
+      this.data[key] = value;
+    };
+
+    DefaultStore.prototype.clear = function clear() {
+      this.data = new _emberMetalEmpty_object.default();
+    };
+
+    return DefaultStore;
+  })();
 });
 enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-metal/meta', 'ember-metal/watch_key', 'ember-metal/empty_object', 'ember-metal/watch_path'], function (exports, _emberMetalProperty_get, _emberMetalMeta, _emberMetalWatch_key, _emberMetalEmpty_object, _emberMetalWatch_path) {
   'use strict';
@@ -3649,7 +3682,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
     copy: function (obj) {
       var ret = new ChainNode(null, null, obj);
       var paths = this._paths;
-      var path;
+      var path = undefined;
 
       for (path in paths) {
         // this check will also catch non-number vals.
@@ -3689,7 +3722,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
 
     chain: function (key, path) {
       var chains = this._chains;
-      var node;
+      var node = undefined;
       if (chains === undefined) {
         chains = this._chains = new _emberMetalEmpty_object.default();
       } else {
@@ -3742,7 +3775,7 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
 
       // then notify chains...
       var chains = this._chains;
-      var node;
+      var node = undefined;
       if (chains) {
         for (var key in chains) {
           node = chains[key];
@@ -3918,7 +3951,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
       this._getter = config;
     } else {
       _emberMetalDebug.assert('Ember.computed expects a function or an object as last argument.', typeof config === 'object' && !Array.isArray(config));
-      _emberMetalDebug.assert('Config object pased to a Ember.computed can only contain `get` or `set` keys.', (function () {
+      _emberMetalDebug.assert('Config object passed to an Ember.computed can only contain `get` or `set` keys.', (function () {
         var keys = Object.keys(config);
         for (var i = 0; i < keys.length; i++) {
           if (keys[i] !== 'get' && keys[i] !== 'set') {
@@ -4027,14 +4060,13 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
     @public
   */
   ComputedPropertyPrototype.property = function () {
-    var args;
+    var args = [];
 
-    var addArg = function (property) {
+    function addArg(property) {
       _emberMetalDebug.warn('Dependent keys containing @each only work one level deep. ' + 'You cannot use nested forms like todos.@each.owner.name or todos.@each.owner.@each.name. ' + 'Please create an intermediary computed property.', DEEP_EACH_REGEX.test(property) === false, { id: 'ember-metal.computed-deep-each' });
       args.push(property);
-    };
+    }
 
-    args = [];
     for (var i = 0; i < arguments.length; i++) {
       _emberMetalExpand_properties.default(arguments[i], addArg);
     }
@@ -4312,7 +4344,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
   */
 
   function computed(func) {
-    var args;
+    var args = undefined;
 
     if (arguments.length > 1) {
       args = [].slice.call(arguments);
@@ -4507,7 +4539,8 @@ enifed('ember-metal/dependent_keys', ['exports', 'ember-metal/watching'], functi
   function addDependentKeys(desc, obj, keyName, meta) {
     // the descriptor has a list of dependent keys, so
     // add all of its dependent keys.
-    var idx, depKey;
+    var idx = undefined,
+        depKey = undefined;
     var depKeys = desc._dependentKeys;
     if (!depKeys) {
       return;
@@ -4526,13 +4559,12 @@ enifed('ember-metal/dependent_keys', ['exports', 'ember-metal/watching'], functi
     // the descriptor has a list of dependent keys, so
     // remove all of its dependent keys.
     var depKeys = desc._dependentKeys;
-    var idx, depKey;
     if (!depKeys) {
       return;
     }
 
-    for (idx = 0; idx < depKeys.length; idx++) {
-      depKey = depKeys[idx];
+    for (var idx = 0; idx < depKeys.length; idx++) {
+      var depKey = depKeys[idx];
       // Decrement the number of times depKey depends on keyName.
       meta.writeDeps(depKey, keyName, (meta.peekDeps(depKey, keyName) || 0) - 1);
       // Unwatch the depKey
@@ -4593,7 +4625,7 @@ enifed('ember-metal/dictionary', ['exports', 'ember-metal/empty_object'], functi
   // only makes sense for long-lived dictionaries that aren't instantiated often.
 
   function makeDictionary(parent) {
-    var dict;
+    var dict = undefined;
     if (parent === null) {
       dict = new _emberMetalEmpty_object.default();
     } else {
@@ -4672,6 +4704,18 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
   exports.dispatchError = dispatchError;
   exports.setDispatchOverride = setDispatchOverride;
 
+  // To maintain stacktrace consistency across browsers
+  var getStack = function (error) {
+    var stack = error.stack;
+    var message = error.message;
+
+    if (stack.indexOf(message) === -1) {
+      stack = message + '\n' + stack;
+    }
+
+    return stack;
+  };
+
   var onerror = undefined;
   // Ember.onerror getter
 
@@ -4709,7 +4753,7 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
     if (onerror) {
       onerror(error);
     } else {
-      _emberConsole.default.error(error.stack);
+      _emberConsole.default.error(getStack(error));
     }
   }
 });
@@ -5023,13 +5067,13 @@ enifed('ember-metal/events', ['exports', 'ember-metal/debug', 'ember-metal/utils
   
   
     ``` javascript
-    var Job = Ember.Object.extend({
+    let Job = Ember.Object.extend({
       logCompleted: Ember.on('completed', function() {
         console.log('Job completed!');
       })
     });
   
-    var job = Job.create();
+    let job = Job.create();
   
     Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
    ```
@@ -5223,7 +5267,7 @@ enifed('ember-metal/get_properties', ['exports', 'ember-metal/property_get'], fu
     return ret;
   }
 });
-enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/version', 'ember-metal/core', 'ember-metal/debug', 'ember-metal/features', 'ember-metal/assign', 'ember-metal/merge', 'ember-metal/instrumentation', 'ember-metal/utils', 'ember-metal/meta', 'ember-metal/error', 'ember-metal/cache', 'ember-console', 'ember-metal/property_get', 'ember-metal/events', 'ember-metal/observer_set', 'ember-metal/property_events', 'ember-metal/properties', 'ember-metal/property_set', 'ember-metal/map', 'ember-metal/get_properties', 'ember-metal/set_properties', 'ember-metal/watch_key', 'ember-metal/chains', 'ember-metal/watch_path', 'ember-metal/watching', 'ember-metal/expand_properties', 'ember-metal/computed', 'ember-metal/alias', 'ember-metal/observer', 'ember-metal/mixin', 'ember-metal/binding', 'ember-metal/path_cache', 'ember-metal/testing', 'ember-metal/error_handler', 'ember-metal/run_loop', 'ember-metal/libraries', 'ember-metal/is_none', 'ember-metal/is_empty', 'ember-metal/is_blank', 'ember-metal/is_present', 'backburner'], function (exports, _require, _emberEnvironment, _emberVersion, _emberMetalCore, _emberMetalDebug, _emberMetalFeatures, _emberMetalAssign, _emberMetalMerge, _emberMetalInstrumentation, _emberMetalUtils, _emberMetalMeta, _emberMetalError, _emberMetalCache, _emberConsole, _emberMetalProperty_get, _emberMetalEvents, _emberMetalObserver_set, _emberMetalProperty_events, _emberMetalProperties, _emberMetalProperty_set, _emberMetalMap, _emberMetalGet_properties, _emberMetalSet_properties, _emberMetalWatch_key, _emberMetalChains, _emberMetalWatch_path, _emberMetalWatching, _emberMetalExpand_properties, _emberMetalComputed, _emberMetalAlias, _emberMetalObserver, _emberMetalMixin, _emberMetalBinding, _emberMetalPath_cache, _emberMetalTesting, _emberMetalError_handler, _emberMetalRun_loop, _emberMetalLibraries, _emberMetalIs_none, _emberMetalIs_empty, _emberMetalIs_blank, _emberMetalIs_present, _backburner) {
+enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/version', 'ember-metal/core', 'ember-metal/debug', 'ember-metal/features', 'ember-metal/assign', 'ember-metal/merge', 'ember-metal/instrumentation', 'ember-metal/utils', 'ember-metal/meta', 'ember-metal/error', 'ember-metal/cache', 'ember-console', 'ember-metal/property_get', 'ember-metal/events', 'ember-metal/observer_set', 'ember-metal/property_events', 'ember-metal/properties', 'ember-metal/property_set', 'ember-metal/weak_map', 'ember-metal/map', 'ember-metal/get_properties', 'ember-metal/set_properties', 'ember-metal/watch_key', 'ember-metal/chains', 'ember-metal/watch_path', 'ember-metal/watching', 'ember-metal/expand_properties', 'ember-metal/computed', 'ember-metal/alias', 'ember-metal/observer', 'ember-metal/mixin', 'ember-metal/binding', 'ember-metal/path_cache', 'ember-metal/testing', 'ember-metal/error_handler', 'ember-metal/run_loop', 'ember-metal/libraries', 'ember-metal/is_none', 'ember-metal/is_empty', 'ember-metal/is_blank', 'ember-metal/is_present', 'backburner'], function (exports, _require, _emberEnvironment, _emberVersion, _emberMetalCore, _emberMetalDebug, _emberMetalFeatures, _emberMetalAssign, _emberMetalMerge, _emberMetalInstrumentation, _emberMetalUtils, _emberMetalMeta, _emberMetalError, _emberMetalCache, _emberConsole, _emberMetalProperty_get, _emberMetalEvents, _emberMetalObserver_set, _emberMetalProperty_events, _emberMetalProperties, _emberMetalProperty_set, _emberMetalWeak_map, _emberMetalMap, _emberMetalGet_properties, _emberMetalSet_properties, _emberMetalWatch_key, _emberMetalChains, _emberMetalWatch_path, _emberMetalWatching, _emberMetalExpand_properties, _emberMetalComputed, _emberMetalAlias, _emberMetalObserver, _emberMetalMixin, _emberMetalBinding, _emberMetalPath_cache, _emberMetalTesting, _emberMetalError_handler, _emberMetalRun_loop, _emberMetalLibraries, _emberMetalIs_none, _emberMetalIs_empty, _emberMetalIs_blank, _emberMetalIs_present, _backburner) {
   /**
   @module ember
   @submodule ember-metal
@@ -5302,6 +5346,9 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
   _emberMetalCore.default.set = _emberMetalProperty_set.set;
   _emberMetalCore.default.trySet = _emberMetalProperty_set.trySet;
 
+  if (_emberMetalFeatures.default('ember-metal-weakmap')) {
+    _emberMetalCore.default.WeakMap = _emberMetalWeak_map.default;
+  }
   _emberMetalCore.default.OrderedSet = _emberMetalMap.OrderedSet;
   _emberMetalCore.default.Map = _emberMetalMap.Map;
   _emberMetalCore.default.MapWithDefault = _emberMetalMap.MapWithDefault;
@@ -5337,7 +5384,6 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
   _emberMetalCore.default._suspendObserver = _emberMetalObserver._suspendObserver;
   _emberMetalCore.default._suspendObservers = _emberMetalObserver._suspendObservers;
 
-  _emberMetalCore.default.IS_BINDING = _emberMetalMixin.IS_BINDING;
   _emberMetalCore.default.required = _emberMetalMixin.required;
   _emberMetalCore.default.aliasMethod = _emberMetalMixin.aliasMethod;
   _emberMetalCore.default.observer = _emberMetalMixin.observer;
@@ -5371,6 +5417,7 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
 
     return new BackburnerAlias(arguments);
   };
+
   _emberMetalCore.default._Backburner = _backburner.default;
 
   /**
@@ -5404,7 +5451,7 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
       return _emberEnvironment.ENV.LOG_STACKTRACE_ON_DEPRECATION;
     },
     set: function (value) {
-      return _emberEnvironment.ENV.LOG_STACKTRACE_ON_DEPRECATION = !!value;
+      _emberEnvironment.ENV.LOG_STACKTRACE_ON_DEPRECATION = !!value;
     },
     enumerable: false
   });
@@ -5414,7 +5461,7 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
       return _emberEnvironment.ENV.LOG_VERSION;
     },
     set: function (value) {
-      return _emberEnvironment.ENV.LOG_VERSION = !!value;
+      _emberEnvironment.ENV.LOG_VERSION = !!value;
     },
     enumerable: false
   });
@@ -5424,7 +5471,7 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
       return _emberEnvironment.ENV.MODEL_FACTORY_INJECTIONS;
     },
     set: function (value) {
-      return _emberEnvironment.ENV.MODEL_FACTORY_INJECTIONS = !!value;
+      _emberEnvironment.ENV.MODEL_FACTORY_INJECTIONS = !!value;
     },
     enumerable: false
   });
@@ -5434,7 +5481,7 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
       return _emberEnvironment.ENV.LOG_BINDINGS;
     },
     set: function (value) {
-      return _emberEnvironment.ENV.LOG_BINDINGS = !!value;
+      _emberEnvironment.ENV.LOG_BINDINGS = !!value;
     },
     enumerable: false
   });
@@ -5456,7 +5503,7 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
       return _emberEnvironment.context.lookup;
     },
     set: function (value) {
-      return _emberEnvironment.context.lookup = value;
+      _emberEnvironment.context.lookup = value;
     },
     enumerable: false
   });
@@ -5543,6 +5590,8 @@ enifed('ember-metal/index', ['exports', 'require', 'ember-environment', 'ember/v
 enifed('ember-metal/injected_property', ['exports', 'ember-metal/debug', 'ember-metal/computed', 'ember-metal/alias', 'ember-metal/properties', 'container/owner'], function (exports, _emberMetalDebug, _emberMetalComputed, _emberMetalAlias, _emberMetalProperties, _containerOwner) {
   'use strict';
 
+  exports.default = InjectedProperty;
+
   /**
     Read-only property that returns the result of a container lookup.
   
@@ -5554,6 +5603,7 @@ enifed('ember-metal/injected_property', ['exports', 'ember-metal/debug', 'ember-
            to the property's name
     @private
   */
+
   function InjectedProperty(type, name) {
     this.type = type;
     this.name = name;
@@ -5582,10 +5632,7 @@ enifed('ember-metal/injected_property', ['exports', 'ember-metal/debug', 'ember-
 
   InjectedPropertyPrototype.get = ComputedPropertyPrototype.get;
   InjectedPropertyPrototype.readOnly = ComputedPropertyPrototype.readOnly;
-
   InjectedPropertyPrototype.teardown = ComputedPropertyPrototype.teardown;
-
-  exports.default = InjectedProperty;
 });
 enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-metal/features'], function (exports, _emberEnvironment, _emberMetalFeatures) {
   'use strict';
@@ -5605,11 +5652,11 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
   
     ```javascript
     Ember.subscribe("render", {
-      before: function(name, timestamp, payload) {
+      before(name, timestamp, payload) {
   
       },
   
-      after: function(name, timestamp, payload) {
+      after(name, timestamp, payload) {
   
       }
     });
@@ -5647,9 +5694,9 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
   exports.subscribers = subscribers;
   var cache = {};
 
-  var populateListeners = function (name) {
+  function populateListeners(name) {
     var listeners = [];
-    var subscriber;
+    var subscriber = undefined;
 
     for (var i = 0; i < subscribers.length; i++) {
       subscriber = subscribers[i];
@@ -5660,7 +5707,7 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
 
     cache[name] = listeners;
     return listeners;
-  };
+  }
 
   var time = (function () {
     var perf = 'undefined' !== typeof window ? window.performance || {} : {};
@@ -5705,7 +5752,7 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
     }
   }
 
-  var flaggedInstrument;
+  var flaggedInstrument = undefined;
   if (_emberMetalFeatures.default('ember-improved-instrumentation')) {
     exports.flaggedInstrument = flaggedInstrument = instrument;
   } else {
@@ -5744,14 +5791,15 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
     var payload = _payload();
 
     var STRUCTURED_PROFILE = _emberEnvironment.ENV.STRUCTURED_PROFILE;
-    var timeName;
+    var timeName = undefined;
     if (STRUCTURED_PROFILE) {
       timeName = name + ': ' + payload.object;
       console.time(timeName);
     }
 
     var beforeValues = new Array(listeners.length);
-    var i, listener;
+    var i = undefined,
+        listener = undefined;
     var timestamp = time();
     for (i = 0; i < listeners.length; i++) {
       listener = listeners[i];
@@ -5759,7 +5807,8 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
     }
 
     return function _instrumentEnd() {
-      var i, listener;
+      var i = undefined,
+          listener = undefined;
       var timestamp = time();
       for (i = 0; i < listeners.length; i++) {
         listener = listeners[i];
@@ -5789,7 +5838,7 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
 
   function subscribe(pattern, object) {
     var paths = pattern.split('.');
-    var path;
+    var path = undefined;
     var regex = [];
 
     for (var i = 0; i < paths.length; i++) {
@@ -5827,7 +5876,7 @@ enifed('ember-metal/instrumentation', ['exports', 'ember-environment', 'ember-me
   */
 
   function unsubscribe(subscriber) {
-    var index;
+    var index = undefined;
 
     for (var i = 0; i < subscribers.length; i++) {
       if (subscribers[i] === subscriber) {
@@ -5889,6 +5938,8 @@ enifed('ember-metal/is_blank', ['exports', 'ember-metal/is_empty'], function (ex
 enifed('ember-metal/is_empty', ['exports', 'ember-metal/property_get', 'ember-metal/is_none'], function (exports, _emberMetalProperty_get, _emberMetalIs_none) {
   'use strict';
 
+  exports.default = isEmpty;
+
   /**
     Verifies that a value is `null` or an empty string, empty array,
     or empty function.
@@ -5915,6 +5966,7 @@ enifed('ember-metal/is_empty', ['exports', 'ember-metal/property_get', 'ember-me
     @return {Boolean}
     @public
   */
+
   function isEmpty(obj) {
     var none = _emberMetalIs_none.default(obj);
     if (none) {
@@ -5939,16 +5991,14 @@ enifed('ember-metal/is_empty', ['exports', 'ember-metal/property_get', 'ember-me
     }
 
     if (objectType === 'object') {
-      var length = _emberMetalProperty_get.get(obj, 'length');
-      if (typeof length === 'number') {
-        return !length;
+      var _length = _emberMetalProperty_get.get(obj, 'length');
+      if (typeof _length === 'number') {
+        return !_length;
       }
     }
 
     return false;
   }
-
-  exports.default = isEmpty;
 });
 enifed("ember-metal/is_none", ["exports"], function (exports) {
   /**
@@ -6072,7 +6122,7 @@ enifed('ember-metal/libraries', ['exports', 'ember-metal/debug', 'ember-metal/fe
 
     deRegister: function (name) {
       var lib = this._getLibraryByName(name);
-      var index;
+      var index = undefined;
 
       if (lib) {
         index = this._registry.indexOf(lib);
@@ -6275,14 +6325,13 @@ enifed('ember-metal/map', ['exports', 'ember-metal/utils', 'ember-metal/empty_ob
       }
 
       var list = this.list;
-      var i;
 
       if (arguments.length === 2) {
-        for (i = 0; i < list.length; i++) {
+        for (var i = 0; i < list.length; i++) {
           fn.call(arguments[1], list[i]);
         }
       } else {
-        for (i = 0; i < list.length; i++) {
+        for (var i = 0; i < list.length; i++) {
           fn(list[i]);
         }
       }
@@ -6472,16 +6521,17 @@ enifed('ember-metal/map', ['exports', 'ember-metal/utils', 'ember-metal/empty_ob
       }
 
       var map = this;
-      var cb, thisArg;
+      var cb = undefined,
+          thisArg = undefined;
 
       if (arguments.length === 2) {
         thisArg = arguments[1];
         cb = function (key) {
-          callback.call(thisArg, map.get(key), key, map);
+          return callback.call(thisArg, map.get(key), key, map);
         };
       } else {
         cb = function (key) {
-          callback(map.get(key), key, map);
+          return callback(map.get(key), key, map);
         };
       }
 
@@ -6586,10 +6636,10 @@ enifed('ember-metal/merge', ['exports'], function (exports) {
     Merge the contents of two objects together into the first object.
   
     ```javascript
-    Ember.merge({first: 'Tom'}, {last: 'Dale'}); // {first: 'Tom', last: 'Dale'}
-    var a = {first: 'Yehuda'};
-    var b = {last: 'Katz'};
-    Ember.merge(a, b); // a == {first: 'Yehuda', last: 'Katz'}, b == {last: 'Katz'}
+    Ember.merge({ first: 'Tom' }, { last: 'Dale' }); // { first: 'Tom', last: 'Dale' }
+    var a = { first: 'Yehuda' };
+    var b = { last: 'Katz' };
+    Ember.merge(a, b); // a == { first: 'Yehuda', last: 'Katz' }, b == { last: 'Katz' }
     ```
   
     @method merge
@@ -6609,7 +6659,7 @@ enifed('ember-metal/merge', ['exports'], function (exports) {
     }
 
     var props = Object.keys(updates);
-    var prop;
+    var prop = undefined;
 
     for (var i = 0; i < props.length; i++) {
       prop = props[i];
@@ -7216,6 +7266,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
   @module ember
   @submodule ember-metal
   */
+  exports.detectBinding = detectBinding;
   exports.mixin = mixin;
   exports.default = Mixin;
   exports.hasUnprocessedMixins = hasUnprocessedMixins;
@@ -7229,7 +7280,6 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
   function ROOT() {}
   ROOT.__hasSuper = false;
 
-  var REQUIRED;
   var a_slice = [].slice;
 
   function isMethod(obj) {
@@ -7239,7 +7289,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
   var CONTINUE = {};
 
   function mixinProperties(mixinsMeta, mixin) {
-    var guid;
+    var guid = undefined;
 
     if (mixin instanceof Mixin) {
       guid = _emberMetalUtils.guidFor(mixin);
@@ -7254,7 +7304,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
   }
 
   function concatenatedMixinProperties(concatProp, props, values, base) {
-    var concats;
+    var concats = undefined;
 
     // reset before adding each new mixin to pickup concats from previous
     concats = values[concatProp] || base[concatProp];
@@ -7266,7 +7316,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
   }
 
   function giveDescriptorSuper(meta, key, property, values, descs, base) {
-    var superProperty;
+    var superProperty = undefined;
 
     // Computed properties override methods, and do not call super to them
     if (values[key] === undefined) {
@@ -7304,7 +7354,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
   }
 
   function giveMethodSuper(obj, key, method, values, descs) {
-    var superMethod;
+    var superMethod = undefined;
 
     // Methods overwrite computed properties, and do not call super to them.
     if (descs[key] === undefined) {
@@ -7410,7 +7460,12 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
   }
 
   function mergeMixins(mixins, m, descs, values, base, keys) {
-    var currentMixin, props, key, concats, mergings, meta;
+    var currentMixin = undefined,
+        props = undefined,
+        key = undefined,
+        concats = undefined,
+        mergings = undefined,
+        meta = undefined;
 
     function removeKeys(keyName) {
       delete descs[keyName];
@@ -7455,14 +7510,16 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     }
   }
 
-  var IS_BINDING = /^.+Binding$/;
+  function detectBinding(key) {
+    var length = key.length;
 
-  function detectBinding(obj, key, value, m) {
-    if (IS_BINDING.test(key)) {
-      m.writeBindings(key, value);
-    }
+    return length > 7 && key.charCodeAt(length - 7) === 66 && key.indexOf('inding', length - 6) !== -1;
   }
 
+  // warm both paths of above function
+  detectBinding('notbound');
+  detectBinding('fooBinding');
+
   function connectBindings(obj, m) {
     // TODO Mixin.apply(instance) should disconnect binding if exists
     m.forEachBindings(function (key, binding) {
@@ -7490,8 +7547,8 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
 
   function followAlias(obj, desc, m, descs, values) {
     var altKey = desc.methodName;
-    var value;
-    var possibleDesc;
+    var value = undefined;
+    var possibleDesc = undefined;
     if (descs[altKey] || values[altKey]) {
       value = values[altKey];
       desc = descs[altKey];
@@ -7537,7 +7594,9 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     var values = {};
     var m = _emberMetalMeta.meta(obj);
     var keys = [];
-    var key, value, desc;
+    var key = undefined,
+        value = undefined,
+        desc = undefined;
 
     obj._super = ROOT;
 
@@ -7574,7 +7633,11 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
       }
 
       replaceObserversAndListeners(obj, key, value);
-      detectBinding(obj, key, value, m);
+
+      if (detectBinding(key)) {
+        m.writeBindings(key, value);
+      }
+
       _emberMetalProperties.defineProperty(obj, key, desc, value, m);
     }
 
@@ -7736,7 +7799,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     @private
   */
   MixinPrototype.reopen = function () {
-    var currentMixin;
+    var currentMixin = undefined;
 
     if (this.properties) {
       currentMixin = new Mixin(undefined, this.properties);
@@ -7747,7 +7810,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     }
 
     var mixins = this.mixins;
-    var idx;
+    var idx = undefined;
 
     for (idx = 0; idx < arguments.length; idx++) {
       currentMixin = arguments[idx];
@@ -7880,7 +7943,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     return ret;
   };
 
-  exports.REQUIRED = REQUIRED = new _emberMetalProperties.Descriptor();
+  var REQUIRED = new _emberMetalProperties.Descriptor();
   REQUIRED.toString = function () {
     return '(Required Property)';
   };
@@ -7916,7 +7979,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
       moniker: Ember.aliasMethod('name')
     });
   
-    var goodGuy = App.Person.create();
+    let goodGuy = App.Person.create();
   
     goodGuy.name();    // 'Tomhuda Katzdale'
     goodGuy.moniker(); // 'Tomhuda Katzdale'
@@ -7964,7 +8027,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     }
 
     var func = args.slice(-1)[0];
-    var paths;
+    var paths = undefined;
 
     var addWatchedProperty = function (path) {
       paths.push(path);
@@ -8047,7 +8110,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
       valueDidChange: Ember.observer('content.value', function(obj, keyName) {
           // only run if updating a value already in the DOM
           if (this.get('state') === 'inDOM') {
-            var color = obj.get(keyName) > this.changingFrom ? 'green' : 'red';
+            let color = obj.get(keyName) > this.changingFrom ? 'green' : 'red';
             // logic
           }
       }),
@@ -8077,7 +8140,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     }
 
     var func = args.slice(-1)[0];
-    var paths;
+    var paths = undefined;
 
     var addWatchedProperty = function (path) {
       paths.push(path);
@@ -8106,7 +8169,6 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/error', 'ember-metal/debug'
     return func;
   }
 
-  exports.IS_BINDING = IS_BINDING;
   exports.Mixin = Mixin;
   exports.required = required;
   exports.REQUIRED = REQUIRED;
@@ -8228,6 +8290,8 @@ enifed('ember-metal/observer', ['exports', 'ember-metal/watching', 'ember-metal/
 enifed('ember-metal/observer_set', ['exports', 'ember-metal/utils', 'ember-metal/events'], function (exports, _emberMetalUtils, _emberMetalEvents) {
   'use strict';
 
+  exports.default = ObserverSet;
+
   /*
     this.observerSet = {
       [senderGuid]: { // variable name: `keySet`
@@ -8246,7 +8310,6 @@ enifed('ember-metal/observer_set', ['exports', 'ember-metal/utils', 'ember-metal
       ...
     ]
   */
-  exports.default = ObserverSet;
 
   function ObserverSet() {
     this.clear();
@@ -8257,7 +8320,7 @@ enifed('ember-metal/observer_set', ['exports', 'ember-metal/utils', 'ember-metal
     var observers = this.observers;
     var senderGuid = _emberMetalUtils.guidFor(sender);
     var keySet = observerSet[senderGuid];
-    var index;
+    var index = undefined;
 
     if (!keySet) {
       observerSet[senderGuid] = keySet = {};
@@ -8277,7 +8340,9 @@ enifed('ember-metal/observer_set', ['exports', 'ember-metal/utils', 'ember-metal
 
   ObserverSet.prototype.flush = function () {
     var observers = this.observers;
-    var i, observer, sender;
+    var i = undefined,
+        observer = undefined,
+        sender = undefined;
     this.clear();
     for (i = 0; i < observers.length; ++i) {
       observer = observers[i];
@@ -8311,15 +8376,12 @@ enifed('ember-metal/path_cache', ['exports', 'ember-metal/cache'], function (exp
   var isGlobalCache = new _emberMetalCache.default(1000, function (key) {
     return IS_GLOBAL.test(key);
   });
-
   var isGlobalPathCache = new _emberMetalCache.default(1000, function (key) {
     return IS_GLOBAL_PATH.test(key);
   });
-
   var hasThisCache = new _emberMetalCache.default(1000, function (key) {
     return key.lastIndexOf(HAS_THIS, 0) === 0;
   });
-
   var firstDotIndexCache = new _emberMetalCache.default(1000, function (key) {
     return key.indexOf('.');
   });
@@ -8509,7 +8571,10 @@ enifed('ember-metal/properties', ['exports', 'ember-metal/debug', 'ember-metal/f
   */
 
   function defineProperty(obj, keyName, desc, data, meta) {
-    var possibleDesc, existingDesc, watching, value;
+    var possibleDesc = undefined,
+        existingDesc = undefined,
+        watching = undefined,
+        value = undefined;
 
     if (!meta) {
       meta = _emberMetalMeta.meta(obj);
@@ -8698,7 +8763,8 @@ enifed('ember-metal/property_events', ['exports', 'ember-metal/utils', 'ember-me
     _emberMetalTags.markObjectAsDirty(m);
   }
 
-  var WILL_SEEN, DID_SEEN;
+  var WILL_SEEN = undefined,
+      DID_SEEN = undefined;
   // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
   function dependentKeysWillChange(obj, depKey, meta) {
     if (obj.isDestroying) {
@@ -8707,15 +8773,15 @@ enifed('ember-metal/property_events', ['exports', 'ember-metal/utils', 'ember-me
 
     if (meta && meta.hasDeps(depKey)) {
       var seen = WILL_SEEN;
-      var top = !seen;
+      var _top = !seen;
 
-      if (top) {
+      if (_top) {
         seen = WILL_SEEN = {};
       }
 
       iterDeps(propertyWillChange, obj, depKey, seen, meta);
 
-      if (top) {
+      if (_top) {
         WILL_SEEN = null;
       }
     }
@@ -8729,22 +8795,23 @@ enifed('ember-metal/property_events', ['exports', 'ember-metal/utils', 'ember-me
 
     if (meta && meta.hasDeps(depKey)) {
       var seen = DID_SEEN;
-      var top = !seen;
+      var _top2 = !seen;
 
-      if (top) {
+      if (_top2) {
         seen = DID_SEEN = {};
       }
 
       iterDeps(propertyDidChange, obj, depKey, seen, meta);
 
-      if (top) {
+      if (_top2) {
         DID_SEEN = null;
       }
     }
   }
 
   function iterDeps(method, obj, depKey, seen, meta) {
-    var possibleDesc, desc;
+    var possibleDesc = undefined,
+        desc = undefined;
     var guid = _emberMetalUtils.guidFor(obj);
     var current = seen[guid];
 
@@ -8847,7 +8914,8 @@ enifed('ember-metal/property_events', ['exports', 'ember-metal/utils', 'ember-me
     }
 
     var eventName = keyName + ':before';
-    var listeners, added;
+    var listeners = undefined,
+        added = undefined;
     if (deferred) {
       listeners = beforeObserverSet.add(obj, keyName, eventName);
       added = _emberMetalEvents.accumulateListeners(obj, eventName, listeners);
@@ -8863,7 +8931,7 @@ enifed('ember-metal/property_events', ['exports', 'ember-metal/utils', 'ember-me
     }
 
     var eventName = keyName + ':change';
-    var listeners;
+    var listeners = undefined;
     if (deferred) {
       listeners = observerSet.add(obj, keyName, eventName);
       _emberMetalEvents.accumulateListeners(obj, eventName, listeners);
@@ -8942,7 +9010,7 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
 
     var value = obj[keyName];
     var desc = value !== null && typeof value === 'object' && value.isDescriptor ? value : undefined;
-    var ret;
+    var ret = undefined;
 
     if (desc === undefined && _emberMetalPath_cache.isPath(keyName)) {
       return _getPath(obj, keyName);
@@ -9105,10 +9173,8 @@ enifed('ember-metal/property_set', ['exports', 'ember-metal/debug', 'ember-metal
   }
 
   function setPath(root, path, value, tolerant) {
-    var keyName;
-
     // get the last part of the path
-    keyName = path.slice(path.lastIndexOf('.') + 1);
+    var keyName = path.slice(path.lastIndexOf('.') + 1);
 
     // get the first part of the part
     path = path === keyName ? keyName : path.slice(0, path.length - (keyName.length + 1));
@@ -9166,7 +9232,8 @@ enifed("ember-metal/replace", ["exports"], function (exports) {
     var size = 60000;
     var start = idx;
     var ends = amt;
-    var count, chunk;
+    var count = undefined,
+        chunk = undefined;
 
     while (args.length) {
       count = ends > size ? size : ends;
@@ -9682,43 +9749,43 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/debug', 'ember-metal/tes
     `run.throttle()`.
   
     ```javascript
-    var runNext = run.next(myContext, function() {
+    let runNext = run.next(myContext, function() {
       // will not be executed
     });
   
     run.cancel(runNext);
   
-    var runLater = run.later(myContext, function() {
+    let runLater = run.later(myContext, function() {
       // will not be executed
     }, 500);
   
     run.cancel(runLater);
   
-    var runScheduleOnce = run.scheduleOnce('afterRender', myContext, function() {
+    let runScheduleOnce = run.scheduleOnce('afterRender', myContext, function() {
       // will not be executed
     });
   
     run.cancel(runScheduleOnce);
   
-    var runOnce = run.once(myContext, function() {
+    let runOnce = run.once(myContext, function() {
       // will not be executed
     });
   
     run.cancel(runOnce);
   
-    var throttle = run.throttle(myContext, function() {
+    let throttle = run.throttle(myContext, function() {
       // will not be executed
     }, 1, false);
   
     run.cancel(throttle);
   
-    var debounce = run.debounce(myContext, function() {
+    let debounce = run.debounce(myContext, function() {
       // will not be executed
     }, 1);
   
     run.cancel(debounce);
   
-    var debounceImmediate = run.debounce(myContext, function() {
+    let debounceImmediate = run.debounce(myContext, function() {
       // will be executed since we passed in true (immediate)
     }, 100, true);
   
@@ -9751,7 +9818,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/debug', 'ember-metal/tes
       console.log(this.name + ' ran.');
     }
   
-    var myContext = { name: 'debounce' };
+    let myContext = { name: 'debounce' };
   
     run.debounce(myContext, whoRan, 150);
   
@@ -9774,7 +9841,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/debug', 'ember-metal/tes
       console.log(this.name + ' ran.');
     }
   
-    var myContext = { name: 'debounce' };
+    let myContext = { name: 'debounce' };
   
     run.debounce(myContext, whoRan, 150, true);
   
@@ -9817,7 +9884,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/debug', 'ember-metal/tes
       console.log(this.name + ' ran.');
     }
   
-    var myContext = { name: 'throttle' };
+    let myContext = { name: 'throttle' };
   
     run.throttle(myContext, whoRan, 150);
     // whoRan is invoked with context myContext
@@ -9878,7 +9945,7 @@ enifed('ember-metal/set_properties', ['exports', 'ember-metal/property_events',
     observers will be buffered.
   
     ```javascript
-    var anObject = Ember.Object.create();
+    let anObject = Ember.Object.create();
   
     anObject.setProperties({
       firstName: 'Stanley',
@@ -9900,7 +9967,7 @@ enifed('ember-metal/set_properties', ['exports', 'ember-metal/property_events',
     }
     _emberMetalProperty_events.changeProperties(function () {
       var props = Object.keys(properties);
-      var propertyName;
+      var propertyName = undefined;
 
       for (var i = 0; i < props.length; i++) {
         propertyName = props[i];
@@ -10220,7 +10287,7 @@ enifed('ember-metal/utils', ['exports'], function (exports) {
       return '(null)';
     }
 
-    var ret;
+    var ret = undefined;
     var type = typeof obj;
 
     // Don't allow prototype changes to String etc. to change the guidFor
@@ -10347,7 +10414,7 @@ enifed('ember-metal/utils', ['exports'], function (exports) {
     Checks to see if the `methodName` exists on the `obj`.
   
     ```javascript
-    var foo = { bar: function() { return 'bar'; }, baz: null };
+    let foo = { bar: function() { return 'bar'; }, baz: null };
   
     Ember.canInvoke(foo, 'bar'); // true
     Ember.canInvoke(foo, 'baz'); // false
@@ -10370,7 +10437,7 @@ enifed('ember-metal/utils', ['exports'], function (exports) {
     and if it does, invokes it with the arguments passed.
   
     ```javascript
-    var d = new Date('03/15/2013');
+    let d = new Date('03/15/2013');
   
     Ember.tryInvoke(d, 'getTime');              // 1363320000000
     Ember.tryInvoke(d, 'setFullYear', [2014]);  // 1394856000000
@@ -10410,7 +10477,7 @@ enifed('ember-metal/utils', ['exports'], function (exports) {
     Ember.makeArray('lindsay');   // ['lindsay']
     Ember.makeArray([1, 2, 42]);  // [1, 2, 42]
   
-    var controller = Ember.ArrayProxy.create({ content: [] });
+    let controller = Ember.ArrayProxy.create({ content: [] });
   
     Ember.makeArray(controller) === controller;  // true
     ```
@@ -10465,7 +10532,7 @@ enifed('ember-metal/utils', ['exports'], function (exports) {
     }
 
     // Object.prototype.toString === {}.toString
-    var v;
+    var v = undefined;
     var ret = [];
     for (var key in obj) {
       if (obj.hasOwnProperty(key)) {
@@ -10789,7 +10856,10 @@ enifed('ember-metal/watching', ['exports', 'ember-metal/chains', 'ember-metal/wa
 
   function destroy(obj) {
     var meta = _emberMetalMeta.peekMeta(obj);
-    var node, nodes, key, nodeObject;
+    var node = undefined,
+        nodes = undefined,
+        key = undefined,
+        nodeObject = undefined;
 
     if (meta) {
       _emberMetalMeta.deleteMeta(obj);
@@ -10821,7 +10891,7 @@ enifed('ember-metal/watching', ['exports', 'ember-metal/chains', 'ember-metal/wa
     }
   }
 });
-enifed('ember-metal/weak_map', ['exports', 'ember-metal/debug', 'ember-metal/utils', 'ember-metal/meta'], function (exports, _emberMetalDebug, _emberMetalUtils, _emberMetalMeta) {
+enifed('ember-metal/weak_map', ['exports', 'ember-metal/utils', 'ember-metal/meta'], function (exports, _emberMetalUtils, _emberMetalMeta) {
   'use strict';
 
   exports.default = WeakMap;
@@ -10829,9 +10899,15 @@ enifed('ember-metal/weak_map', ['exports', 'ember-metal/debug', 'ember-metal/uti
   var id = 0;
   function UNDEFINED() {}
 
+  // Returns whether Type(value) is Object according to the terminology in the spec
+  function isObject(value) {
+    return typeof value === 'object' && value !== null || typeof value === 'function';
+  }
+
   /*
-   * @private
    * @class Ember.WeakMap
+   * @public
+   * @category ember-metal-weakmap
    *
    * A partial polyfill for [WeakMap](http://www.ecma-international.org/ecma-262/6.0/#sec-weakmap-objects).
    *
@@ -10842,10 +10918,26 @@ enifed('ember-metal/weak_map', ['exports', 'ember-metal/debug', 'ember-metal/uti
    * in ember-metal.
    */
 
-  function WeakMap() {
-    _emberMetalDebug.assert('Invoking the WeakMap constructor with arguments is not supported at this time', arguments.length === 0);
+  function WeakMap(iterable) {
+    if (!(this instanceof WeakMap)) {
+      throw new TypeError('Constructor WeakMap requires \'new\'');
+    }
 
     this._id = _emberMetalUtils.GUID_KEY + id++;
+
+    if (iterable === null || iterable === undefined) {
+      return;
+    } else if (Array.isArray(iterable)) {
+      for (var i = 0; i < iterable.length; i++) {
+        var _iterable$i = iterable[i];
+        var key = _iterable$i[0];
+        var value = _iterable$i[1];
+
+        this.set(key, value);
+      }
+    } else {
+      throw new TypeError('The weak map constructor polyfill only supports an array argument');
+    }
   }
 
   /*
@@ -10854,6 +10946,10 @@ enifed('ember-metal/weak_map', ['exports', 'ember-metal/debug', 'ember-metal/uti
    * @return {Any} stored value
    */
   WeakMap.prototype.get = function (obj) {
+    if (!isObject(obj)) {
+      return undefined;
+    }
+
     var meta = _emberMetalMeta.peekMeta(obj);
     if (meta) {
       var map = meta.readableWeak();
@@ -10874,7 +10970,9 @@ enifed('ember-metal/weak_map', ['exports', 'ember-metal/debug', 'ember-metal/uti
    * @return {WeakMap} the weak map
    */
   WeakMap.prototype.set = function (obj, value) {
-    _emberMetalDebug.assert('Uncaught TypeError: Invalid value used as weak map key', obj && (typeof obj === 'object' || typeof obj === 'function'));
+    if (!isObject(obj)) {
+      throw new TypeError('Invalid value used as weak map key');
+    }
 
     if (value === undefined) {
       value = UNDEFINED;
@@ -10891,6 +10989,10 @@ enifed('ember-metal/weak_map', ['exports', 'ember-metal/debug', 'ember-metal/uti
    * @return {boolean} if the key exists
    */
   WeakMap.prototype.has = function (obj) {
+    if (!isObject(obj)) {
+      return false;
+    }
+
     var meta = _emberMetalMeta.peekMeta(obj);
     if (meta) {
       var map = meta.readableWeak();
@@ -10915,6 +11017,14 @@ enifed('ember-metal/weak_map', ['exports', 'ember-metal/debug', 'ember-metal/uti
       return false;
     }
   };
+
+  /*
+   * @method toString
+   * @return {String}
+   */
+  WeakMap.prototype.toString = function () {
+    return '[object WeakMap]';
+  };
 });
 enifed('ember-runtime/compare', ['exports', 'ember-runtime/utils', 'ember-runtime/mixins/comparable'], function (exports, _emberRuntimeUtils, _emberRuntimeMixinsComparable) {
   'use strict';
@@ -11134,11 +11244,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var ToDoList = Ember.Object.extend({
+    let ToDoList = Ember.Object.extend({
       isDone: Ember.computed.empty('todos')
     });
   
-    var todoList = ToDoList.create({
+    let todoList = ToDoList.create({
       todos: ['Unit Test', 'Documentation', 'Release']
     });
   
@@ -11169,11 +11279,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       hasStuff: Ember.computed.notEmpty('backpack')
     });
   
-    var hamster = Hamster.create({ backpack: ['Food', 'Sleeping Bag', 'Tent'] });
+    let hamster = Hamster.create({ backpack: ['Food', 'Sleeping Bag', 'Tent'] });
   
     hamster.get('hasStuff');         // true
     hamster.get('backpack').clear(); // []
@@ -11202,11 +11312,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       isHungry: Ember.computed.none('food')
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('isHungry'); // true
     hamster.set('food', 'Banana');
@@ -11236,11 +11346,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var User = Ember.Object.extend({
+    let User = Ember.Object.extend({
       isAnonymous: Ember.computed.not('loggedIn')
     });
   
-    var user = User.create({loggedIn: false});
+    let user = User.create({loggedIn: false});
   
     user.get('isAnonymous'); // true
     user.set('loggedIn', true);
@@ -11266,11 +11376,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     into a boolean value.
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       hasBananas: Ember.computed.bool('numBananas')
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('hasBananas'); // false
     hamster.set('numBananas', 0);
@@ -11303,11 +11413,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var User = Ember.Object.extend({
+    let User = Ember.Object.extend({
       hasValidEmail: Ember.computed.match('email', /^.+@.+\..+$/)
     });
   
-    var user = User.create({loggedIn: false});
+    let user = User.create({loggedIn: false});
   
     user.get('hasValidEmail'); // false
     user.set('email', '');
@@ -11340,11 +11450,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       napTime: Ember.computed.equal('state', 'sleepy')
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('napTime'); // false
     hamster.set('state', 'sleepy');
@@ -11375,11 +11485,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       hasTooManyBananas: Ember.computed.gt('numBananas', 10)
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('hasTooManyBananas'); // false
     hamster.set('numBananas', 3);
@@ -11410,11 +11520,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       hasTooManyBananas: Ember.computed.gte('numBananas', 10)
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('hasTooManyBananas'); // false
     hamster.set('numBananas', 3);
@@ -11445,11 +11555,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       needsMoreBananas: Ember.computed.lt('numBananas', 3)
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('needsMoreBananas'); // true
     hamster.set('numBananas', 3);
@@ -11480,11 +11590,11 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       needsMoreBananas: Ember.computed.lte('numBananas', 3)
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('needsMoreBananas'); // true
     hamster.set('numBananas', 5);
@@ -11515,17 +11625,17 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     You may pass in more than two properties and even use
     property brace expansion.  The computed property will
     return the first falsy value or last truthy value
-    just like JavaScript's `||` operator.
+    just like JavaScript's `&&` operator.
   
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       readyForCamp: Ember.computed.and('hasTent', 'hasBackpack'),
       readyForHike: Ember.computed.and('hasWalkingStick', 'hasBackpack')
     });
   
-    var tomster = Hamster.create();
+    let tomster = Hamster.create();
   
     tomster.get('readyForCamp'); // false
     tomster.set('hasTent', true);
@@ -11562,12 +11672,12 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       readyForRain: Ember.computed.or('hasJacket', 'hasUmbrella'),
       readyForBeach: Ember.computed.or('{hasSunscreen,hasUmbrella}')
     });
   
-    var tomster = Hamster.create();
+    let tomster = Hamster.create();
   
     tomster.get('readyForRain'); // undefined
     tomster.set('hasUmbrella', true);
@@ -11596,12 +11706,12 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     though they were called on the original property.
   
     ```javascript
-    var Person = Ember.Object.extend({
+    let Person = Ember.Object.extend({
       name: 'Alex Matchneer',
       nomen: Ember.computed.alias('name')
     });
   
-    var alex = Person.create();
+    let alex = Person.create();
   
     alex.get('nomen'); // 'Alex Matchneer'
     alex.get('name');  // 'Alex Matchneer'
@@ -11628,13 +11738,13 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var User = Ember.Object.extend({
+    let User = Ember.Object.extend({
       firstName: null,
       lastName: null,
       nickName: Ember.computed.oneWay('firstName')
     });
   
-    var teddy = User.create({
+    let teddy = User.create({
       firstName: 'Teddy',
       lastName:  'Zeenny'
     });
@@ -11678,13 +11788,13 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     Example
   
     ```javascript
-    var User = Ember.Object.extend({
+    let User = Ember.Object.extend({
       firstName: null,
       lastName: null,
       nickName: Ember.computed.readOnly('firstName')
     });
   
-    var teddy = User.create({
+    let teddy = User.create({
       firstName: 'Teddy',
       lastName:  'Zeenny'
     });
@@ -11714,9 +11824,24 @@ enifed('ember-runtime/computed/computed_macros', ['exports', 'ember-metal/debug'
     though they were called on the original property, but also
     print a deprecation warning.
   
+    ```javascript
+    let Hamster = Ember.Object.extend({
+      bananaCount: Ember.computed.deprecatingAlias('cavendishCount', {
+        id: 'hamster.deprecate-banana',
+        until: '3.0.0'
+      })
+    });
+  
+    let hamster = Hamster.create();
+  
+    hamster.set('bananaCount', 5); // Prints a deprecation warning.
+    hamster.get('cavendishCount'); // 5
+    ```
+  
     @method deprecatingAlias
     @for Ember.computed
     @param {String} dependentKey
+    @param {Object} options Options for `Ember.deprecate`.
     @return {Ember.ComputedProperty} computed property which creates an
     alias with a deprecation to the original value for property.
     @since 1.7.0
@@ -11777,7 +11902,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
 
   function arrayMacro(dependentKey, callback) {
     // This is a bit ugly
-    var propertyName;
+    var propertyName = undefined;
     if (/@each/.test(dependentKey)) {
       propertyName = dependentKey.replace(/\.@each.*$/, '');
     } else {
@@ -11831,12 +11956,12 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     array is empty.
   
     ```javascript
-    var Person = Ember.Object.extend({
+    let Person = Ember.Object.extend({
       childAges: Ember.computed.mapBy('children', 'age'),
       maxChildAge: Ember.computed.max('childAges')
     });
   
-    var lordByron = Person.create({ children: [] });
+    let lordByron = Person.create({ children: [] });
   
     lordByron.get('maxChildAge'); // -Infinity
     lordByron.get('children').pushObject({
@@ -11879,12 +12004,12 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     array is empty.
   
     ```javascript
-    var Person = Ember.Object.extend({
+    let Person = Ember.Object.extend({
       childAges: Ember.computed.mapBy('children', 'age'),
       minChildAge: Ember.computed.min('childAges')
     });
   
-    var lordByron = Person.create({ children: [] });
+    let lordByron = Person.create({ children: [] });
   
     lordByron.get('minChildAge'); // Infinity
     lordByron.get('children').pushObject({
@@ -11935,13 +12060,13 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       excitingChores: Ember.computed.map('chores', function(chore, index) {
         return chore.toUpperCase() + '!';
       })
     });
   
-    var hamster = Hamster.create({
+    let hamster = Hamster.create({
       chores: ['clean', 'write more unit tests']
     });
   
@@ -11966,11 +12091,11 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Returns an array mapped to the specified key.
   
     ```javascript
-    var Person = Ember.Object.extend({
+    let Person = Ember.Object.extend({
       childAges: Ember.computed.mapBy('children', 'age')
     });
   
-    var lordByron = Person.create({ children: [] });
+    let lordByron = Person.create({ children: [] });
   
     lordByron.get('childAges'); // []
     lordByron.get('children').pushObject({ name: 'Augusta Ada Byron', age: 7 });
@@ -12014,13 +12139,13 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     ```
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       remainingChores: Ember.computed.filter('chores', function(chore, index, array) {
         return !chore.done;
       })
     });
   
-    var hamster = Hamster.create({
+    let hamster = Hamster.create({
       chores: [
         { name: 'cook', done: true },
         { name: 'clean', done: true },
@@ -12049,11 +12174,11 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Filters the array by the property and value
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       remainingChores: Ember.computed.filterBy('chores', 'done', false)
     });
   
-    var hamster = Hamster.create({
+    let hamster = Hamster.create({
       chores: [
         { name: 'cook', done: true },
         { name: 'clean', done: true },
@@ -12074,7 +12199,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
   */
 
   function filterBy(dependentKey, propertyKey, value) {
-    var callback;
+    var callback = undefined;
 
     if (arguments.length === 2) {
       callback = function (item) {
@@ -12096,11 +12221,11 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       uniqueFruits: Ember.computed.uniq('fruits')
     });
   
-    var hamster = Hamster.create({
+    let hamster = Hamster.create({
       fruits: [
         'banana',
         'grape',
@@ -12148,12 +12273,14 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
   /**
     A computed property which returns a new array with all the unique
     elements from an array, with uniqueness determined by specific key.
+  
     Example
+  
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       uniqueFruits: Ember.computed.uniqBy('fruits', 'id')
     });
-    var hamster = Hamster.create({
+    let hamster = Hamster.create({
       fruits: [
         { id: 1, 'banana' },
         { id: 2, 'grape' },
@@ -12163,6 +12290,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     });
     hamster.get('uniqueFruits'); // [ { id: 1, 'banana' }, { id: 2, 'grape' }, { id: 3, 'peach' }]
     ```
+  
     @method uniqBy
     @for Ember.computed
     @param {String} dependentKey
@@ -12210,7 +12338,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Example
   
     ```javascript
-    var obj = Ember.Object.extend({
+    let obj = Ember.Object.extend({
       friendsInCommon: Ember.computed.intersect('adaFriends', 'charlesFriends')
     }).create({
       adaFriends: ['Charles Babbage', 'John Hobhouse', 'William King', 'Mary Somerville'],
@@ -12273,12 +12401,12 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       likes: ['banana', 'grape', 'kale'],
       wants: Ember.computed.setDiff('likes', 'fruits')
     });
   
-    var hamster = Hamster.create({
+    let hamster = Hamster.create({
       fruits: [
         'grape',
         'kale',
@@ -12327,11 +12455,11 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Example
   
     ```javascript
-    var Hamster = Ember.Object.extend({
+    let Hamster = Ember.Object.extend({
       clothes: Ember.computed.collect('hat', 'shirt')
     });
   
-    var hamster = Hamster.create();
+    let hamster = Hamster.create();
   
     hamster.get('clothes'); // [null, null]
     hamster.set('hat', 'Camp Hat');
@@ -12392,7 +12520,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     Example
   
     ```javascript
-    var ToDoList = Ember.Object.extend({
+    let ToDoList = Ember.Object.extend({
       // using standard ascending sort
       todosSorting: ['name'],
       sortedTodos: Ember.computed.sort('todos', 'todosSorting'),
@@ -12413,7 +12541,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
       })
     });
   
-    var todoList = ToDoList.create({todos: [
+    let todoList = ToDoList.create({todos: [
       { name: 'Unit Test', priority: 2 },
       { name: 'Documentation', priority: 3 },
       { name: 'Release', priority: 1 }
@@ -12475,7 +12603,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
 
       if (activeObservers) {
         activeObservers.forEach(function (args) {
-          _emberMetalObserver.removeObserver.apply(null, args);
+          return _emberMetalObserver.removeObserver.apply(null, args);
         });
       }
 
@@ -12603,7 +12731,9 @@ enifed('ember-runtime/copy', ['exports', 'ember-metal/debug', 'ember-runtime/sys
   exports.default = copy;
 
   function _copy(obj, deep, seen, copies) {
-    var ret, loc, key;
+    var ret = undefined,
+        loc = undefined,
+        key = undefined;
 
     // primitive data types are immutable, just return them.
     if (typeof obj !== 'object' || obj === null) {
@@ -12717,7 +12847,7 @@ enifed('ember-runtime/ext/function', ['exports', 'ember-environment', 'ember-met
           return this.get('firstName') + ' ' + this.get('lastName');
         }.property() // Call this flag to mark the function as a property
       });
-       var president = MyApp.President.create({
+       let president = MyApp.President.create({
         firstName: 'Barack',
         lastName: 'Obama'
       });
@@ -13233,18 +13363,17 @@ enifed('ember-runtime/inject', ['exports', 'ember-metal/debug', 'ember-metal/inj
   function validatePropertyInjections(factory) {
     var proto = factory.proto();
     var types = [];
-    var key, desc, validator, i;
 
-    for (key in proto) {
-      desc = proto[key];
+    for (var key in proto) {
+      var desc = proto[key];
       if (desc instanceof _emberMetalInjected_property.default && types.indexOf(desc.type) === -1) {
         types.push(desc.type);
       }
     }
 
     if (types.length) {
-      for (i = 0; i < types.length; i++) {
-        validator = typeValidators[types[i]];
+      for (var i = 0; i < types.length; i++) {
+        var validator = typeValidators[types[i]];
 
         if (typeof validator === 'function') {
           validator(factory);
@@ -13429,14 +13558,14 @@ enifed('ember-runtime/mixins/action_handler', ['exports', 'ember-metal/debug', '
        ```js
       App.CanDisplayBanner = Ember.Mixin.create({
         actions: {
-          displayBanner: function(msg) {
+          displayBanner(msg) {
             // ...
           }
         }
       });
        App.WelcomeRoute = Ember.Route.extend(App.CanDisplayBanner, {
         actions: {
-          playMusic: function() {
+          playMusic() {
             // ...
           }
         }
@@ -13453,7 +13582,7 @@ enifed('ember-runtime/mixins/action_handler', ['exports', 'ember-metal/debug', '
        ```js
       App.SongRoute = Ember.Route.extend({
         actions: {
-          myAction: function() {
+          myAction() {
             this.controllerFor("song");
             this.transitionTo("other.route");
             ...
@@ -13468,14 +13597,14 @@ enifed('ember-runtime/mixins/action_handler', ['exports', 'ember-metal/debug', '
        ```js
       App.DebugRoute = Ember.Mixin.create({
         actions: {
-          debugRouteInformation: function() {
+          debugRouteInformation() {
             console.debug("trololo");
           }
         }
       });
        App.AnnoyingDebugRoute = Ember.Route.extend(App.DebugRoute, {
         actions: {
-          debugRouteInformation: function() {
+          debugRouteInformation() {
             // also call the debugRouteInformation of mixed in App.DebugRoute
             this._super(...arguments);
              // show additional annoyance
@@ -13502,7 +13631,7 @@ enifed('ember-runtime/mixins/action_handler', ['exports', 'ember-metal/debug', '
       });
        App.AlbumSongRoute = Ember.Route.extend({
         actions: {
-          startPlaying: function() {
+          startPlaying() {
             // ...
              if (actionShouldAlsoBeTriggeredOnParentRoute) {
               return true;
@@ -13529,10 +13658,10 @@ enifed('ember-runtime/mixins/action_handler', ['exports', 'ember-metal/debug', '
        ```js
       App.WelcomeRoute = Ember.Route.extend({
         actions: {
-          playTheme: function() {
+          playTheme() {
              this.send('playMusic', 'theme.mp3');
           },
-          playMusic: function(track) {
+          playMusic(track) {
             // ...
           }
         }
@@ -13548,7 +13677,7 @@ enifed('ember-runtime/mixins/action_handler', ['exports', 'ember-metal/debug', '
         args[_key - 1] = arguments[_key];
       }
 
-      var target;
+      var target = undefined;
 
       if (this.actions && this.actions[actionName]) {
         var shouldBubble = this.actions[actionName].apply(this, args) === true;
@@ -13609,6 +13738,8 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
   exports.addArrayObserver = addArrayObserver;
   exports.removeArrayObserver = removeArrayObserver;
   exports.objectAt = objectAt;
+  exports.arrayContentWillChange = arrayContentWillChange;
+  exports.arrayContentDidChange = arrayContentDidChange;
   exports.isEmberArray = isEmberArray;
 
   function arrayObserversHelper(obj, target, opts, operation, notify) {
@@ -13646,6 +13777,100 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
     return content[idx];
   }
 
+  function arrayContentWillChange(array, startIdx, removeAmt, addAmt) {
+    var removing = undefined,
+        lim = undefined;
+
+    // if no args are passed assume everything changes
+    if (startIdx === undefined) {
+      startIdx = 0;
+      removeAmt = addAmt = -1;
+    } else {
+      if (removeAmt === undefined) {
+        removeAmt = -1;
+      }
+
+      if (addAmt === undefined) {
+        addAmt = -1;
+      }
+    }
+
+    if (array.__each) {
+      array.__each.arrayWillChange(array, startIdx, removeAmt, addAmt);
+    }
+
+    _emberMetalEvents.sendEvent(array, '@array:before', [array, startIdx, removeAmt, addAmt]);
+
+    if (startIdx >= 0 && removeAmt >= 0 && _emberMetalProperty_get.get(array, 'hasEnumerableObservers')) {
+      removing = [];
+      lim = startIdx + removeAmt;
+
+      for (var idx = startIdx; idx < lim; idx++) {
+        removing.push(objectAt(array, idx));
+      }
+    } else {
+      removing = removeAmt;
+    }
+
+    array.enumerableContentWillChange(removing, addAmt);
+
+    return array;
+  }
+
+  function arrayContentDidChange(array, startIdx, removeAmt, addAmt) {
+    _emberMetalTags.markObjectAsDirty(_emberMetalMeta.meta(array));
+
+    // if no args are passed assume everything changes
+    if (startIdx === undefined) {
+      startIdx = 0;
+      removeAmt = addAmt = -1;
+    } else {
+      if (removeAmt === undefined) {
+        removeAmt = -1;
+      }
+
+      if (addAmt === undefined) {
+        addAmt = -1;
+      }
+    }
+
+    var adding = undefined;
+    if (startIdx >= 0 && addAmt >= 0 && _emberMetalProperty_get.get(array, 'hasEnumerableObservers')) {
+      adding = [];
+      var lim = startIdx + addAmt;
+
+      for (var idx = startIdx; idx < lim; idx++) {
+        adding.push(objectAt(array, idx));
+      }
+    } else {
+      adding = addAmt;
+    }
+
+    array.enumerableContentDidChange(removeAmt, adding);
+
+    if (array.__each) {
+      array.__each.arrayDidChange(array, startIdx, removeAmt, addAmt);
+    }
+
+    _emberMetalEvents.sendEvent(array, '@array:change', [array, startIdx, removeAmt, addAmt]);
+
+    var length = _emberMetalProperty_get.get(array, 'length');
+    var cachedFirst = _emberMetalComputed.cacheFor(array, 'firstObject');
+    var cachedLast = _emberMetalComputed.cacheFor(array, 'lastObject');
+
+    if (objectAt(array, 0) !== cachedFirst) {
+      _emberMetalProperty_events.propertyWillChange(array, 'firstObject');
+      _emberMetalProperty_events.propertyDidChange(array, 'firstObject');
+    }
+
+    if (objectAt(array, length - 1) !== cachedLast) {
+      _emberMetalProperty_events.propertyWillChange(array, 'lastObject');
+      _emberMetalProperty_events.propertyDidChange(array, 'lastObject');
+    }
+
+    return array;
+  }
+
   var EMBER_ARRAY = _emberMetalSymbol.default('EMBER_ARRAY');
 
   function isEmberArray(obj) {
@@ -13751,7 +13976,6 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
     return ret;
   }, _Mixin$create.indexOf = function (object, startAt) {
     var len = _emberMetalProperty_get.get(this, 'length');
-    var idx;
 
     if (startAt === undefined) {
       startAt = 0;
@@ -13761,7 +13985,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       startAt += len;
     }
 
-    for (idx = startAt; idx < len; idx++) {
+    for (var idx = startAt; idx < len; idx++) {
       if (objectAt(this, idx) === object) {
         return idx;
       }
@@ -13770,7 +13994,6 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
     return -1;
   }, _Mixin$create.lastIndexOf = function (object, startAt) {
     var len = _emberMetalProperty_get.get(this, 'length');
-    var idx;
 
     if (startAt === undefined || startAt >= len) {
       startAt = len - 1;
@@ -13780,7 +14003,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       startAt += len;
     }
 
-    for (idx = startAt; idx >= 0; idx--) {
+    for (var idx = startAt; idx >= 0; idx--) {
       if (objectAt(this, idx) === object) {
         return idx;
       }
@@ -13794,95 +14017,9 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
   }, _Mixin$create.hasArrayObservers = _emberMetalComputed.computed(function () {
     return _emberMetalEvents.hasListeners(this, '@array:change') || _emberMetalEvents.hasListeners(this, '@array:before');
   }), _Mixin$create.arrayContentWillChange = function (startIdx, removeAmt, addAmt) {
-    var removing, lim;
-
-    // if no args are passed assume everything changes
-    if (startIdx === undefined) {
-      startIdx = 0;
-      removeAmt = addAmt = -1;
-    } else {
-      if (removeAmt === undefined) {
-        removeAmt = -1;
-      }
-
-      if (addAmt === undefined) {
-        addAmt = -1;
-      }
-    }
-
-    if (this.__each) {
-      this.__each.arrayWillChange(this, startIdx, removeAmt, addAmt);
-    }
-
-    _emberMetalEvents.sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
-
-    if (startIdx >= 0 && removeAmt >= 0 && _emberMetalProperty_get.get(this, 'hasEnumerableObservers')) {
-      removing = [];
-      lim = startIdx + removeAmt;
-
-      for (var idx = startIdx; idx < lim; idx++) {
-        removing.push(objectAt(this, idx));
-      }
-    } else {
-      removing = removeAmt;
-    }
-
-    this.enumerableContentWillChange(removing, addAmt);
-
-    return this;
+    return arrayContentWillChange(this, startIdx, removeAmt, addAmt);
   }, _Mixin$create.arrayContentDidChange = function (startIdx, removeAmt, addAmt) {
-    var adding, lim;
-
-    _emberMetalTags.markObjectAsDirty(_emberMetalMeta.meta(this));
-
-    // if no args are passed assume everything changes
-    if (startIdx === undefined) {
-      startIdx = 0;
-      removeAmt = addAmt = -1;
-    } else {
-      if (removeAmt === undefined) {
-        removeAmt = -1;
-      }
-
-      if (addAmt === undefined) {
-        addAmt = -1;
-      }
-    }
-
-    if (startIdx >= 0 && addAmt >= 0 && _emberMetalProperty_get.get(this, 'hasEnumerableObservers')) {
-      adding = [];
-      lim = startIdx + addAmt;
-
-      for (var idx = startIdx; idx < lim; idx++) {
-        adding.push(objectAt(this, idx));
-      }
-    } else {
-      adding = addAmt;
-    }
-
-    this.enumerableContentDidChange(removeAmt, adding);
-
-    if (this.__each) {
-      this.__each.arrayDidChange(this, startIdx, removeAmt, addAmt);
-    }
-
-    _emberMetalEvents.sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
-
-    var length = _emberMetalProperty_get.get(this, 'length');
-    var cachedFirst = _emberMetalComputed.cacheFor(this, 'firstObject');
-    var cachedLast = _emberMetalComputed.cacheFor(this, 'lastObject');
-
-    if (objectAt(this, 0) !== cachedFirst) {
-      _emberMetalProperty_events.propertyWillChange(this, 'firstObject');
-      _emberMetalProperty_events.propertyDidChange(this, 'firstObject');
-    }
-
-    if (objectAt(this, length - 1) !== cachedLast) {
-      _emberMetalProperty_events.propertyWillChange(this, 'lastObject');
-      _emberMetalProperty_events.propertyDidChange(this, 'lastObject');
-    }
-
-    return this;
+    return arrayContentDidChange(this, startIdx, removeAmt, addAmt);
   }, _Mixin$create['@each'] = _emberMetalComputed.computed(function () {
     // TODO use Symbol or add to meta
     if (!this.__each) {
@@ -13918,7 +14055,6 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       */
       includes: function (obj, startAt) {
         var len = _emberMetalProperty_get.get(this, 'length');
-        var idx, currentObj;
 
         if (startAt === undefined) {
           startAt = 0;
@@ -13928,8 +14064,8 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
           startAt += len;
         }
 
-        for (idx = startAt; idx < len; idx++) {
-          currentObj = objectAt(this, idx);
+        for (var idx = startAt; idx < len; idx++) {
+          var currentObj = objectAt(this, idx);
 
           // SameValueZero comparison (NaN !== NaN)
           if (obj === currentObj || obj !== obj && currentObj !== currentObj) {
@@ -13962,7 +14098,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
   (i.e. `myArray.get(0)`), then you do not need to implement this method
   yourself.
    ```javascript
-  var arr = ['a', 'b', 'c', 'd'];
+  let arr = ['a', 'b', 'c', 'd'];
    arr.objectAt(0);   // 'a'
   arr.objectAt(3);   // 'd'
   arr.objectAt(-1);  // undefined
@@ -13978,7 +14114,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
 /**
   This returns the objects at the specified indexes, using `objectAt`.
    ```javascript
-  var arr = ['a', 'b', 'c', 'd'];
+  let arr = ['a', 'b', 'c', 'd'];
    arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
   arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
   ```
@@ -14008,7 +14144,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
   uses the observable array methods to retrieve the objects for the new
   slice.
    ```javascript
-  var arr = ['red', 'green', 'blue'];
+  let arr = ['red', 'green', 'blue'];
    arr.slice(0);       // ['red', 'green', 'blue']
   arr.slice(0, 2);    // ['red', 'green']
   arr.slice(1, 100);  // ['green', 'blue']
@@ -14026,7 +14162,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
   search is 0. If it's negative, will count backward from
   the end of the array. Returns -1 if no match is found.
    ```javascript
-  var arr = ['a', 'b', 'c', 'd', 'a'];
+  let arr = ['a', 'b', 'c', 'd', 'a'];
    arr.indexOf('a');       //  0
   arr.indexOf('z');       // -1
   arr.indexOf('a', 2);    //  4
@@ -14047,7 +14183,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
   the last position. If it's negative, will count backward
   from the end of the array. Returns -1 if no match is found.
    ```javascript
-  var arr = ['a', 'b', 'c', 'd', 'a'];
+  let arr = ['a', 'b', 'c', 'd', 'a'];
    arr.lastIndexOf('a');       //  4
   arr.lastIndexOf('z');       // -1
   arr.lastIndexOf('a', 2);    //  0
@@ -14245,23 +14381,23 @@ enifed('ember-runtime/mixins/container_proxy', ['exports', 'ember-metal/run_loop
      The singleton is scoped to the container, allowing multiple containers
      to all have their own locally scoped singletons.
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       registry.register('api:twitter', Twitter);
-      var twitter = container.lookup('api:twitter');
+      let twitter = container.lookup('api:twitter');
       twitter instanceof Twitter; // => true
       // by default the container will return singletons
-     var twitter2 = container.lookup('api:twitter');
+     let twitter2 = container.lookup('api:twitter');
      twitter2 instanceof Twitter; // => true
       twitter === twitter2; //=> true
      ```
       If singletons are not wanted an optional flag can be provided at lookup.
       ```javascript
-     var registry = new Registry();
-     var container = registry.container();
+     let registry = new Registry();
+     let container = registry.container();
       registry.register('api:twitter', Twitter);
-      var twitter = container.lookup('api:twitter', { singleton: false });
-     var twitter2 = container.lookup('api:twitter', { singleton: false });
+      let twitter = container.lookup('api:twitter', { singleton: false });
+     let twitter2 = container.lookup('api:twitter', { singleton: false });
       twitter === twitter2; //=> false
      ```
       @public
@@ -14285,6 +14421,20 @@ enifed('ember-runtime/mixins/container_proxy', ['exports', 'ember-metal/run_loop
       return this.__container__.lookupFactory(fullName, options);
     },
 
+    /**
+     Given a name and a source path, resolve the fullName
+      @private
+     @method _resolveLocalLookupName
+     @param {String} fullName
+     @param {String} source
+     @return {String}
+     */
+    _resolveLocalLookupName: function (name, source) {
+      return this.__container__.registry.expandLocalLookup('component:' + name, {
+        source: source
+      });
+    },
+
     /**
      @private
      */
@@ -14350,8 +14500,6 @@ enifed('ember-runtime/mixins/controller', ['exports', 'ember-metal/mixin', 'embe
     */
     target: null,
 
-    parentController: null,
-
     store: null,
 
     /**
@@ -14591,9 +14739,9 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       contains only one object, this method should always return that object.
       If your enumerable is empty, this method should return `undefined`.
        ```javascript
-      var arr = ['a', 'b', 'c'];
+      let arr = ['a', 'b', 'c'];
       arr.get('firstObject');  // 'a'
-       var arr = [];
+       let arr = [];
       arr.get('firstObject');  // undefined
       ```
        @property firstObject
@@ -14620,9 +14768,9 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       contains only one object, this method should always return that object.
       If your enumerable is empty, this method should return `undefined`.
        ```javascript
-      var arr = ['a', 'b', 'c'];
+      let arr = ['a', 'b', 'c'];
       arr.get('lastObject');  // 'c'
-       var arr = [];
+       let arr = [];
       arr.get('lastObject');  // undefined
       ```
        @property lastObject
@@ -14640,7 +14788,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       var context = popCtx();
       var idx = 0;
       var last = null;
-      var cur;
+      var cur = undefined;
 
       do {
         last = cur;
@@ -14657,11 +14805,12 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       default version will iterate through the enumerable until the object
       is found. You may want to override this with a more efficient version.
        ```javascript
-      var arr = ['a', 'b', 'c'];
+      let arr = ['a', 'b', 'c'];
        arr.contains('a'); // true
       arr.contains('z'); // false
       ```
        @method contains
+      @deprecated Use `Enumerable#includes` instead. See http://emberjs.com/deprecations/v2.x#toc_enumerable-contains
       @param {Object} obj The object to search for.
       @return {Boolean} `true` if object is found in enumerable.
       @public
@@ -14735,7 +14884,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
 
     /**
       Sets the value on the named property for each member. This is more
-      ergonomic than using other methods defined on this helper. If the object
+      efficient than using other methods defined on this helper. If the object
       implements Ember.Observable, the value will be changed to `set(),` otherwise
       it will be set directly. `null` objects are skipped.
        @method setEach
@@ -14746,7 +14895,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
     */
     setEach: function (key, value) {
       return this.forEach(function (item) {
-        _emberMetalProperty_set.set(item, key, value);
+        return _emberMetalProperty_set.set(item, key, value);
       });
     },
 
@@ -14775,7 +14924,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       var ret = emberA();
 
       this.forEach(function (x, idx, i) {
-        ret[idx] = callback.call(target, x, idx, i);
+        return ret[idx] = callback.call(target, x, idx, i);
       });
 
       return ret;
@@ -14885,11 +15034,9 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       var exactValue = function (item) {
         return _emberMetalProperty_get.get(item, key) === value;
       };
-
       var hasValue = function (item) {
         return !!_emberMetalProperty_get.get(item, key);
       };
-
       var use = arguments.length === 2 ? exactValue : hasValue;
 
       return this.reject(use);
@@ -14928,7 +15075,8 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       var context = popCtx();
       var found = false;
       var last = null;
-      var next, ret;
+      var next = undefined,
+          ret = undefined;
 
       for (var idx = 0; idx < len && !found; idx++) {
         next = this.nextObject(idx, last, context);
@@ -15042,13 +15190,13 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       var context = popCtx();
       var found = false;
       var last = null;
-      var next, idx;
+      var next = undefined;
 
       if (target === undefined) {
         target = null;
       }
 
-      for (idx = 0; idx < len && !found; idx++) {
+      for (var idx = 0; idx < len && !found; idx++) {
         next = this.nextObject(idx, last, context);
         found = callback.call(target, next, idx, this);
         last = next;
@@ -15154,7 +15302,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       var ret = emberA();
 
       this.forEach(function (o, idx) {
-        ret[idx] = o;
+        return ret[idx] = o;
       });
 
       return ret;
@@ -15163,7 +15311,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
     /**
       Returns a copy of the array with all `null` and `undefined` elements removed.
        ```javascript
-      var arr = ['a', null, 'c', undefined];
+      let arr = ['a', null, 'c', undefined];
       arr.compact();  // ['a', 'c']
       ```
        @method compact
@@ -15181,7 +15329,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       implementation returns an array regardless of the receiver type.
       If the receiver does not contain the value it returns the original enumerable.
        ```javascript
-      var arr = ['a', 'b', 'a', 'c'];
+      let arr = ['a', 'b', 'a', 'c'];
       arr.without('a');  // ['b', 'c']
       ```
        @method without
@@ -15209,7 +15357,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       Returns a new enumerable that contains only unique values. The default
       implementation returns an array regardless of the receiver type.
        ```javascript
-      var arr = ['a', 'a', 'b', 'b'];
+      let arr = ['a', 'a', 'b', 'b'];
       arr.uniq();  // ['a', 'b']
       ```
        This only works on primitive data types, e.g. Strings, Numbers, etc.
@@ -15329,7 +15477,9 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       @private
     */
     enumerableContentWillChange: function (removing, adding) {
-      var removeCnt, addCnt, hasDelta;
+      var removeCnt = undefined,
+          addCnt = undefined,
+          hasDelta = undefined;
 
       if ('number' === typeof removing) {
         removeCnt = removing;
@@ -15383,7 +15533,9 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
       @private
     */
     enumerableContentDidChange: function (removing, adding) {
-      var removeCnt, addCnt, hasDelta;
+      var removeCnt = undefined,
+          addCnt = undefined,
+          hasDelta = undefined;
 
       if ('number' === typeof removing) {
         removeCnt = removing;
@@ -15458,7 +15610,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
         Returns a new enumerable that contains only items containing a unique property value.
         The default implementation returns an array regardless of the receiver type.
          ```javascript
-        var arr = [{ value: 'a' }, { value: 'a' }, { value: 'b' }, { value: 'b' }];
+        let arr = [{ value: 'a' }, { value: 'a' }, { value: 'b' }, { value: 'b' }];
         arr.uniqBy('value');  // [{ value: 'a' }, { value: 'b' }]
         ```
          @method uniqBy
@@ -15503,7 +15655,8 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/property_get'
         _emberMetalDebug.assert('Enumerable#includes cannot accept a second argument "startAt" as enumerable items are unordered.', arguments.length === 1);
 
         var len = _emberMetalProperty_get.get(this, 'length');
-        var idx, next;
+        var idx = undefined,
+            next = undefined;
         var last = null;
         var found = false;
 
@@ -15806,6 +15959,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
 
   'use strict';
 
+  exports.removeAt = removeAt;
   var OUT_OF_RANGE_EXCEPTION = 'Index out of range';
   var EMPTY = [];
 
@@ -15813,6 +15967,23 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
   // HELPERS
   //
 
+  function removeAt(array, start, len) {
+    if ('number' === typeof start) {
+      if (start < 0 || start >= _emberMetalProperty_get.get(array, 'length')) {
+        throw new _emberMetalError.default(OUT_OF_RANGE_EXCEPTION);
+      }
+
+      // fast case
+      if (len === undefined) {
+        len = 1;
+      }
+
+      array.replace(start, len, EMPTY);
+    }
+
+    return array;
+  }
+
   /**
     This mixin defines the API for modifying array-like objects. These methods
     can be applied only to a collection that keeps its items in an ordered set.
@@ -15856,7 +16027,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Remove all elements from the array. This is useful if you
       want to reuse an existing array without having to recreate it.
        ```javascript
-      var colors = ['red', 'green', 'blue'];
+      let colors = ['red', 'green', 'blue'];
        color.length();   //  3
       colors.clear();   //  []
       colors.length();  //  0
@@ -15879,7 +16050,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       This will use the primitive `replace()` method to insert an object at the
       specified index.
        ```javascript
-      var colors = ['red', 'green', 'blue'];
+      let colors = ['red', 'green', 'blue'];
        colors.insertAt(2, 'yellow');  // ['red', 'green', 'yellow', 'blue']
       colors.insertAt(5, 'orange');  // Error: Index out of range
       ```
@@ -15904,7 +16075,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
        If you pass a start and length that is beyond the
       length this method will throw an `OUT_OF_RANGE_EXCEPTION`.
        ```javascript
-      var colors = ['red', 'green', 'blue', 'yellow', 'orange'];
+      let colors = ['red', 'green', 'blue', 'yellow', 'orange'];
        colors.removeAt(0);     // ['green', 'blue', 'yellow', 'orange']
       colors.removeAt(2, 2);  // ['green', 'blue']
       colors.removeAt(4, 2);  // Error: Index out of range
@@ -15916,27 +16087,14 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       @public
     */
     removeAt: function (start, len) {
-      if ('number' === typeof start) {
-        if (start < 0 || start >= _emberMetalProperty_get.get(this, 'length')) {
-          throw new _emberMetalError.default(OUT_OF_RANGE_EXCEPTION);
-        }
-
-        // fast case
-        if (len === undefined) {
-          len = 1;
-        }
-
-        this.replace(start, len, EMPTY);
-      }
-
-      return this;
+      return removeAt(this, start, len);
     },
 
     /**
       Push the object onto the end of the array. Works just like `push()` but it
       is KVO-compliant.
        ```javascript
-      var colors = ['red', 'green'];
+      let colors = ['red', 'green'];
        colors.pushObject('black');     // ['red', 'green', 'black']
       colors.pushObject(['yellow']);  // ['red', 'green', ['yellow']]
       ```
@@ -15954,7 +16112,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Add the objects in the passed numerable to the end of the array. Defers
       notifying observers of the change until all objects are added.
        ```javascript
-      var colors = ['red'];
+      let colors = ['red'];
        colors.pushObjects(['yellow', 'orange']);  // ['red', 'yellow', 'orange']
       ```
        @method pushObjects
@@ -15974,7 +16132,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Pop object from array or nil if none are left. Works just like `pop()` but
       it is KVO-compliant.
        ```javascript
-      var colors = ['red', 'green', 'blue'];
+      let colors = ['red', 'green', 'blue'];
        colors.popObject();   // 'blue'
       console.log(colors);  // ['red', 'green']
       ```
@@ -15997,7 +16155,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Shift an object from start of array or nil if none are left. Works just
       like `shift()` but it is KVO-compliant.
        ```javascript
-      var colors = ['red', 'green', 'blue'];
+      let colors = ['red', 'green', 'blue'];
        colors.shiftObject();  // 'red'
       console.log(colors);   // ['green', 'blue']
       ```
@@ -16019,7 +16177,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Unshift an object to start of array. Works just like `unshift()` but it is
       KVO-compliant.
        ```javascript
-      var colors = ['red'];
+      let colors = ['red'];
        colors.unshiftObject('yellow');    // ['yellow', 'red']
       colors.unshiftObject(['black']);   // [['black'], 'yellow', 'red']
       ```
@@ -16037,7 +16195,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Adds the named objects to the beginning of the array. Defers notifying
       observers until all objects have been added.
        ```javascript
-      var colors = ['red'];
+      let colors = ['red'];
        colors.unshiftObjects(['black', 'white']);   // ['black', 'white', 'red']
       colors.unshiftObjects('yellow'); // Type Error: 'undefined' is not a function
       ```
@@ -16073,7 +16231,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Replace all the receiver's content with content of the argument.
       If argument is an empty array receiver will be cleared.
        ```javascript
-      var colors = ['red', 'green', 'blue'];
+      let colors = ['red', 'green', 'blue'];
        colors.setObjects(['black', 'white']);  // ['black', 'white']
       colors.setObjects([]);                  // []
       ```
@@ -16100,7 +16258,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
     /**
       Remove all occurrences of an object in the array.
        ```javascript
-      var cities = ['Chicago', 'Berlin', 'Lima', 'Chicago'];
+      let cities = ['Chicago', 'Berlin', 'Lima', 'Chicago'];
        cities.removeObject('Chicago');  // ['Berlin', 'Lima']
       cities.removeObject('Lima');     // ['Berlin']
       cities.removeObject('Tokyo')     // ['Berlin']
@@ -16126,7 +16284,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       Push the object onto the end of the array if it is not already
       present in the array.
        ```javascript
-      var cities = ['Chicago', 'Berlin'];
+      let cities = ['Chicago', 'Berlin'];
        cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
       cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
       ```
@@ -16136,7 +16294,7 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
       @public
     */
     addObject: function (obj) {
-      var included;
+      var included = undefined;
 
       if (_emberMetalFeatures.default('ember-runtime-enumerable-includes')) {
         included = this.includes(obj);
@@ -16738,10 +16896,10 @@ enifed('ember-runtime/mixins/promise_proxy', ['exports', 'ember-metal/property_g
     A low level mixin making ObjectProxy promise-aware.
   
     ```javascript
-    var ObjectPromiseProxy = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin);
+    let ObjectPromiseProxy = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin);
   
-    var proxy = ObjectPromiseProxy.create({
-      promise: $.getJSON('/some/remote/data.json')
+    let proxy = ObjectPromiseProxy.create({
+      promise: Ember.RSVP.cast($.getJSON('/some/remote/data.json'))
     });
   
     proxy.then(function(json){
@@ -16763,6 +16921,9 @@ enifed('ember-runtime/mixins/promise_proxy', ['exports', 'ember-metal/property_g
   
     When the $.getJSON completes, and the promise is fulfilled
     with json, the life cycle attributes will update accordingly.
+    Note that $.getJSON doesn't return an ECMA specified promise,
+    it is useful to wrap this with an `RSVP.cast` so that it behaves
+    as a spec compliant promise.
   
     ```javascript
     proxy.get('isPending')   //=> false
@@ -16929,7 +17090,7 @@ enifed('ember-runtime/mixins/registry_proxy', ['exports', 'ember-metal/debug', '
       a full name including two parts: `type:name`.
        A simple example:
        ```javascript
-      var App = Ember.Application.create();
+      let App = Ember.Application.create();
        App.Orange = Ember.Object.extend();
       App.register('fruit:favorite', App.Orange);
       ```
@@ -16938,8 +17099,8 @@ enifed('ember-runtime/mixins/registry_proxy', ['exports', 'ember-metal/debug', '
       an application requests `controller:cars`.
        An example of registering a controller with a non-standard name:
        ```javascript
-      var App = Ember.Application.create();
-      var Session = Ember.Controller.extend();
+      let App = Ember.Application.create();
+      let Session = Ember.Controller.extend();
        App.register('controller:session', Session);
        // The Session controller can now be treated like a normal controller,
       // despite its non-standard name.
@@ -16952,7 +17113,7 @@ enifed('ember-runtime/mixins/registry_proxy', ['exports', 'ember-metal/debug', '
       they are looked up they return the same instance.
        Some examples modifying that default behavior:
        ```javascript
-      var App = Ember.Application.create();
+      let App = Ember.Application.create();
        App.Person = Ember.Object.extend();
       App.Orange = Ember.Object.extend();
       App.Email = Ember.Object.extend();
@@ -16973,8 +17134,8 @@ enifed('ember-runtime/mixins/registry_proxy', ['exports', 'ember-metal/debug', '
     /**
      Unregister a factory.
       ```javascript
-     var App = Ember.Application.create();
-     var User = Ember.Object.extend();
+     let App = Ember.Application.create();
+     let User = Ember.Object.extend();
      App.register('model:user', User);
       App.resolveRegistration('model:user').create() instanceof User //=> true
       App.unregister('model:user')
@@ -17036,17 +17197,17 @@ enifed('ember-runtime/mixins/registry_proxy', ['exports', 'ember-metal/debug', '
     /**
      Allow registering options for all factories of a type.
       ```javascript
-     var App = Ember.Application.create();
-     var appInstance = App.buildInstance();
+     let App = Ember.Application.create();
+     let appInstance = App.buildInstance();
       // if all of type `connection` must not be singletons
      appInstance.optionsForType('connection', { singleton: false });
       appInstance.register('connection:twitter', TwitterConnection);
      appInstance.register('connection:facebook', FacebookConnection);
-      var twitter = appInstance.lookup('connection:twitter');
-     var twitter2 = appInstance.lookup('connection:twitter');
+      let twitter = appInstance.lookup('connection:twitter');
+     let twitter2 = appInstance.lookup('connection:twitter');
       twitter === twitter2; // => false
-      var facebook = appInstance.lookup('connection:facebook');
-     var facebook2 = appInstance.lookup('connection:facebook');
+      let facebook = appInstance.lookup('connection:facebook');
+     let facebook2 = appInstance.lookup('connection:facebook');
       facebook === facebook2; // => false
      ```
       @public
@@ -17073,8 +17234,8 @@ enifed('ember-runtime/mixins/registry_proxy', ['exports', 'ember-metal/debug', '
       provide services to a set of framework components.
        An example of providing a session object to all controllers:
        ```javascript
-      var App = Ember.Application.create();
-      var Session = Ember.Object.extend({ isAuthenticated: false });
+      let App = Ember.Application.create();
+      let Session = Ember.Object.extend({ isAuthenticated: false });
        // A factory must be registered before it can be injected
       App.register('session:main', Session);
        // Inject 'session:main' onto all factories of the type 'controller'
@@ -17171,31 +17332,12 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
   @extends Ember.Mixin
   @private
   */
-  var TargetActionSupport = _emberMetalMixin.Mixin.create({
+  exports.default = _emberMetalMixin.Mixin.create({
     target: null,
     action: null,
     actionContext: null,
 
-    targetObject: _emberMetalComputed.computed('target', function () {
-      if (this._targetObject) {
-        return this._targetObject;
-      }
-
-      var target = _emberMetalProperty_get.get(this, 'target');
-
-      if (typeof target === 'string') {
-        var value = _emberMetalProperty_get.get(this, target);
-        if (value === undefined) {
-          value = _emberMetalProperty_get.get(_emberEnvironment.context.lookup, target);
-        }
-
-        return value;
-      } else {
-        return target;
-      }
-    }),
-
-    actionContextObject: _emberMetalComputed.computed(function () {
+    actionContextObject: _emberMetalComputed.computed('actionContext', function () {
       var actionContext = _emberMetalProperty_get.get(this, 'actionContext');
 
       if (typeof actionContext === 'string') {
@@ -17207,7 +17349,7 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
       } else {
         return actionContext;
       }
-    }).property('actionContext'),
+    }),
 
     /**
     Send an `action` with an `actionContext` to a `target`. The action, actionContext
@@ -17217,7 +17359,7 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
       target: Ember.computed.alias('controller'),
       action: 'save',
       actionContext: Ember.computed.alias('context'),
-      click: function() {
+      click() {
         this.triggerAction(); // Sends the `save` action, along with the current context
                               // to the current controller
       }
@@ -17227,7 +17369,7 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
     an optional object argument to `triggerAction` as well.
      ```javascript
     App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
-      click: function() {
+      click() {
         this.triggerAction({
           action: 'save',
           target: this.get('controller'),
@@ -17243,7 +17385,7 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
      ```javascript
     App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
       target: Ember.computed.alias('controller'),
-      click: function() {
+      click() {
         this.triggerAction({
           action: 'save'
         }); // Sends the `save` action, along with a reference to `this`,
@@ -17260,7 +17402,12 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
       var opts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
 
       var action = opts.action || _emberMetalProperty_get.get(this, 'action');
-      var target = opts.target || _emberMetalProperty_get.get(this, 'targetObject');
+      var target = opts.target;
+
+      if (!target) {
+        target = getTarget(this);
+      }
+
       var actionContext = opts.actionContext;
 
       function args(options, actionName) {
@@ -17277,7 +17424,7 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
       }
 
       if (target && action) {
-        var ret;
+        var ret = undefined;
 
         if (target.send) {
           ret = target.send.apply(target, args(actionContext, action));
@@ -17297,7 +17444,36 @@ enifed('ember-runtime/mixins/target_action_support', ['exports', 'ember-environm
     }
   });
 
-  exports.default = TargetActionSupport;
+  function getTarget(instance) {
+    // TODO: Deprecate specifying `targetObject`
+    var target = _emberMetalProperty_get.get(instance, 'targetObject');
+
+    // if a `targetObject` CP was provided, use it
+    if (target) {
+      return target;
+    }
+
+    // if _targetObject use it
+    if (instance._targetObject) {
+      return instance._targetObject;
+    }
+
+    target = _emberMetalProperty_get.get(instance, 'target');
+    if (target) {
+      if (typeof target === 'string') {
+        var value = _emberMetalProperty_get.get(instance, target);
+        if (value === undefined) {
+          value = _emberMetalProperty_get.get(_emberEnvironment.context.lookup, target);
+        }
+
+        return value;
+      } else {
+        return target;
+      }
+    }
+
+    return null;
+  }
 });
 enifed("ember-runtime/string_registry", ["exports"], function (exports) {
   // STATE within a module is frowned apon, this exists
@@ -17351,8 +17527,8 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
     A simple example of usage:
   
     ```javascript
-    var pets = ['dog', 'cat', 'fish'];
-    var ap = Ember.ArrayProxy.create({ content: Ember.A(pets) });
+    let pets = ['dog', 'cat', 'fish'];
+    let ap = Ember.ArrayProxy.create({ content: Ember.A(pets) });
   
     ap.get('firstObject');                        // 'dog'
     ap.set('content', ['amoeba', 'paramecium']);
@@ -17364,8 +17540,8 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
     `objectAtContent`:
   
     ```javascript
-    var pets = ['dog', 'cat', 'fish'];
-    var ap = Ember.ArrayProxy.create({
+    let pets = ['dog', 'cat', 'fish'];
+    let ap = Ember.ArrayProxy.create({
         content: Ember.A(pets),
         objectAtContent: function(idx) {
             return this.get('content').objectAt(idx).toUpperCase();
@@ -17381,7 +17557,7 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
     @uses Ember.MutableArray
     @public
   */
-  var ArrayProxy = _emberRuntimeSystemObject.default.extend(_emberRuntimeMixinsMutable_array.default, {
+  exports.default = _emberRuntimeSystemObject.default.extend(_emberRuntimeMixinsMutable_array.default, {
 
     /**
       The content array. Must be an object that implements `Ember.Array` and/or
@@ -17600,7 +17776,6 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
         var content = _emberMetalProperty_get.get(this, 'content');
         var arrangedContent = _emberMetalProperty_get.get(this, 'arrangedContent');
         var indices = [];
-        var i;
 
         if (start < 0 || start >= _emberMetalProperty_get.get(this, 'length')) {
           throw new _emberMetalError.default(OUT_OF_RANGE_EXCEPTION);
@@ -17611,7 +17786,7 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
         }
 
         // Get a list of indices in original content to remove
-        for (i = start; i < start + len; i++) {
+        for (var i = start; i < start + len; i++) {
           // Use arrangedContent here so we avoid confusion with objects transformed by objectAtContent
           indices.push(content.indexOf(_emberRuntimeMixinsArray.objectAt(arrangedContent, i)));
         }
@@ -17622,7 +17797,7 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
         });
 
         _emberMetalProperty_events.beginPropertyChanges();
-        for (i = 0; i < indices.length; i++) {
+        for (var i = 0; i < indices.length; i++) {
           this._replace(indices[i], 1, EMPTY);
         }
         _emberMetalProperty_events.endPropertyChanges();
@@ -17670,11 +17845,11 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
     },
 
     arrangedContentArrayWillChange: function (item, idx, removedCnt, addedCnt) {
-      this.arrayContentWillChange(idx, removedCnt, addedCnt);
+      _emberRuntimeMixinsArray.arrayContentWillChange(this, idx, removedCnt, addedCnt);
     },
 
     arrangedContentArrayDidChange: function (item, idx, removedCnt, addedCnt) {
-      this.arrayContentDidChange(idx, removedCnt, addedCnt);
+      _emberRuntimeMixinsArray.arrayContentDidChange(this, idx, removedCnt, addedCnt);
     },
 
     init: function () {
@@ -17688,8 +17863,6 @@ enifed('ember-runtime/system/array_proxy', ['exports', 'ember-metal/debug', 'emb
       this._teardownContent();
     }
   });
-
-  exports.default = ArrayProxy;
 });
 enifed('ember-runtime/system/container', ['exports', 'ember-metal/property_set', 'container/registry', 'container/container', 'container/owner'], function (exports, _emberMetalProperty_set, _containerRegistry, _containerContainer, _containerOwner) {
   'use strict';
@@ -17773,7 +17946,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal/debug', 'emb
             var keyName = keyNames[j];
             var value = properties[keyName];
 
-            if (_emberMetalMixin.IS_BINDING.test(keyName)) {
+            if (_emberMetalMixin.detectBinding(keyName)) {
               m.writeBindings(keyName, value);
             }
 
@@ -18524,6 +18697,8 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal/debug', 'emb
 enifed('ember-runtime/system/each_proxy', ['exports', 'ember-metal/debug', 'ember-metal/property_get', 'ember-metal/observer', 'ember-metal/property_events', 'ember-metal/empty_object', 'ember-runtime/mixins/array'], function (exports, _emberMetalDebug, _emberMetalProperty_get, _emberMetalObserver, _emberMetalProperty_events, _emberMetalEmpty_object, _emberRuntimeMixinsArray) {
   'use strict';
 
+  exports.default = EachProxy;
+
   /**
     This is the object instance returned when you get the `@each` property on an
     array. It uses the unknownProperty handler to automatically create
@@ -18531,6 +18706,7 @@ enifed('ember-runtime/system/each_proxy', ['exports', 'ember-metal/debug', 'embe
     @class EachProxy
     @private
   */
+
   function EachProxy(content) {
     this._content = content;
     this._keys = undefined;
@@ -18640,8 +18816,6 @@ enifed('ember-runtime/system/each_proxy', ['exports', 'ember-metal/debug', 'embe
       }
     }
   }
-
-  exports.default = EachProxy;
 });
 enifed('ember-runtime/system/lazy_load', ['exports', 'ember-environment'], function (exports, _emberEnvironment) {
   /*globals CustomEvent */
@@ -18708,8 +18882,8 @@ enifed('ember-runtime/system/lazy_load', ['exports', 'ember-environment'], funct
     var window = _emberEnvironment.environment.window;
 
     if (window && typeof CustomEvent === 'function') {
-      var event = new CustomEvent(name, { detail: object, name: name });
-      window.dispatchEvent(event);
+      var _event = new CustomEvent(name, { detail: object, name: name });
+      window.dispatchEvent(_event);
     }
 
     if (loadHooks[name]) {
@@ -18901,7 +19075,7 @@ enifed('ember-runtime/system/namespace', ['exports', 'ember-metal/core', 'ember-
       processAllNamespaces();
     }
 
-    var ret;
+    var ret = undefined;
 
     if (this[_emberMetalMixin.NAME_KEY]) {
       ret = this[_emberMetalMixin.NAME_KEY];
@@ -18931,7 +19105,7 @@ enifed('ember-runtime/system/namespace', ['exports', 'ember-metal/core', 'ember-
 
     if (unprocessedNamespaces || unprocessedMixins) {
       var namespaces = Namespace.NAMESPACES;
-      var namespace;
+      var namespace = undefined;
 
       for (var i = 0; i < namespaces.length; i++) {
         namespace = namespaces[i];
@@ -19004,7 +19178,7 @@ enifed('ember-runtime/system/native_array', ['exports', 'ember-metal/core', 'emb
       // replaced range. Otherwise, pass the full remaining array length
       // since everything has shifted
       var len = objects ? _emberMetalProperty_get.get(objects, 'length') : 0;
-      this.arrayContentWillChange(idx, amt, len);
+      _emberRuntimeMixinsArray.arrayContentWillChange(this, idx, amt, len);
 
       if (len === 0) {
         this.splice(idx, amt);
@@ -19012,14 +19186,14 @@ enifed('ember-runtime/system/native_array', ['exports', 'ember-metal/core', 'emb
         _emberMetalReplace.default(this, idx, amt, objects);
       }
 
-      this.arrayContentDidChange(idx, amt, len);
+      _emberRuntimeMixinsArray.arrayContentDidChange(this, idx, amt, len);
       return this;
     },
 
     // If you ask for an unknown property, then try to collect the value
     // from member items.
     unknownProperty: function (key, value) {
-      var ret; // = this.reducedProperty(key, value);
+      var ret = undefined; // = this.reducedProperty(key, value);
       if (value !== undefined && ret === undefined) {
         ret = this[key] = value;
       }
@@ -19081,7 +19255,7 @@ enifed('ember-runtime/system/native_array', ['exports', 'ember-metal/core', 'emb
     @return {Ember.NativeArray}
     @public
   */
-  var A;
+  var A = undefined;
 
   if (_emberEnvironment.ENV.EXTEND_PROTOTYPES.Array) {
     NativeArray.apply(Array.prototype);
@@ -19716,7 +19890,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.7.2";
+  exports.default = "2.8.0-beta.1";
 });
 enifed('rsvp', ['exports', 'rsvp/promise', 'rsvp/events', 'rsvp/node', 'rsvp/all', 'rsvp/all-settled', 'rsvp/race', 'rsvp/hash', 'rsvp/hash-settled', 'rsvp/rethrow', 'rsvp/defer', 'rsvp/config', 'rsvp/map', 'rsvp/resolve', 'rsvp/reject', 'rsvp/filter', 'rsvp/asap'], function (exports, _rsvpPromise, _rsvpEvents, _rsvpNode, _rsvpAll, _rsvpAllSettled, _rsvpRace, _rsvpHash, _rsvpHashSettled, _rsvpRethrow, _rsvpDefer, _rsvpConfig, _rsvpMap, _rsvpResolve, _rsvpReject, _rsvpFilter, _rsvpAsap) {
   'use strict';