Merge pull request #1130 from NiLuJe/master

Simplify the H2O special-casing