Merge branch 'dev' of github.com:SignalR/SignalR into dev

We could name this PollTimeout instead of ConnectionTimeout, but if we do that we should probably rename it in the 2.1.2 release.