Merge pull request #1519 from stweil/crlf