Normalize line endings
Merge branch 'develop' into feature/siafutest