Fix submodule pointer (now to branched rust-http)
Merge remote-tracking branch 'origin/master'