PUB-1067: Fix the counts.
Merge branch 'master' of https://github.com/0xdata/h2o