Fix line ending
Let git normalize eol
End-of-line normalization
Merge branch 'pr/n1866_vmeurisse'