change order of when state gets replayed - after all objects are created
Merge branch 'master' into gh-pages