fixed (normalized) line endings
Merge branch 'hotfix/mixed_line_endings' into develop