Merge branch 'inline-replace' into patches
Merge branch 'parent-child-commit-fix' into patches
Merge branch 'has_one' into patches
Merge branch 'always-serialize-belongs-to' into patches

Conflicts:
	packages/ember-data/tests/integration/json_serialization_test.js