CoC snapshot update 20141207

Ember changes