Hiding resharper from github. Sneaky sneaky.
Merge remote-tracking branch 'origin/master' into TestResultTreeView