A little too hasty with my bug fixes... this is a fix of a fix
Merge branch 'master' of https://github.com/0xdata/h2o