Squash and merge pull request #838 from tomByrer/patch-4
rebase HTTPS &amp; SPDY 3.1 note

Closes #838
Merge branch 'temp-merge'