Converting some line endings to unix form as part diagnosing the problem with the current merge from the DAE branch.