CRLF issue
Merge pull request #1133 from atm-maxime/develop

CRLF issue