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

What's wrong with the formatting? Am I blind?