Merge upstream, don't normalize line endings