updates based on test.0xdata.com fails
Merge branch 'master' of github.com:0xdata/h2o