Merge "Fix line endings"