just do state replay twice to catch everything
Merge branch 'master' into gh-pages