some debug stuff to show the double-render problem
Merge remote-tracking branch 'refs/remotes/local/localmaster'