Fix file endings
Merge pull request #1084 from GrahamCampbell/3.7

Fix File Endings
Merge branch '3.7'