hs2-http patch - adding files missed from initial commit