Merge pull request #1395 from ripieces/master

Normalized line endings (no changes)