Merge pull request #2177 from GawainLynch/master

UNIX line endings.