fixing line endings
Merge branch '1.8'