PUB-837: Port over the fix applied to h2o-dev, was triggering assertion error in RPC.
Merge branch 'master' of https://github.com/0xdata/h2o