Normalization of line endings

Making a new clone did not clear up line endings on my branch. Merging in upstream/develop created the need for the following commit.