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

These changes are ok to leave in this branch just because we don't have the same problems. Maybe we keep them in sync for now but if it becomes a pain we should rethink how we merge.