Add gitattributes to normalize line endings
Merge remote-tracking branch 'upstream/master'