Merge branch 'master' into update-nunit-3.10.1

.gitattributes

@@ -1,19 +1,23 @@
-# This won't normalise line endings, but it will ensure that merge drivers use CRLF
+# Autodetect text files and ensure that we normalise their
-* -text eol=crlf
+# line endings to lf internally. When checked out they may
+# use different line endings.
+* text=auto
 
-# Currently in-use binary file extensions
+# Check out with crlf (Windows) line endings
-*.blend  binary
+*.sln text eol=crlf
-*.bmp    binary
+*.csproj text eol=crlf
-*.dll    binary
+*.cs text diff=csharp eol=crlf
-*.exe    binary
+*.resx text eol=crlf
-*.icns   binary
+*.vsixmanifest text eol=crlf
-*.ico    binary
+packages.config text eol=crlf
-*.jpg    binary
+App.config text eol=crlf
-*.osz2   binary
+*.bat text eol=crlf
-*.pdn    binary
+*.cmd text eol=crlf
-*.psd    binary
+*.snippet text eol=crlf
-*.PSD    binary
+
-*.tga    binary
+# Check out with lf (UNIX) line endings
-*.ttf    binary
+*.sh text eol=lf
-*.wav    binary
+.gitignore text eol=lf
-*.xnb    binary
+.gitattributes text eol=lf
+*.md text eol=lf
+.travis.yml text eol=lf