merged with ember-model (d9d833d1b4f6933a88e4e0b93e12ea0101598b19)

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>