Updated Ember to rc6