Fix broken test suite on Windows
Fix broken merge tests due to autocrlf was not false
Merge pull request #2751 from linquize/broken-test-win

Fix broken tests on Windows