SPDY: fix bug #1211 reintroduced in 7bedd8f
Merge remote-tracking branch upstream/$:{upbranch}