Removed my previous commit as it was causing problems when used with auto conversion.
Merge branch 'master' of github.com:0xdata/h2o