Merge remote-tracking branch 'origin/stable'
Updating to support new SSL & SPDY changes
Merge remote-tracking branch 'origin/master' into stable