Merge fixes from 1.x branch to the 2.x branch in Ember.