Fixes line ending issue.
Merge branch 'dev'