Fix line and file endings.
Merge pull request #1137 from benmanns/fix-line-and-file-endings

Fix line and file endings.