h2 improvements
Merge branch 'master' of github.com:antler/caribou-core