Revert "Committing files with line ending changes"

This reverts commit ba76a0dc803a412458ea9e088fda02cc58f9d7fb.
Merge branch 'master' into iss716