Code

Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint