line endings in .gitattributes
Merge remote-tracking branch 'remotes/origin/master' into osx_port
updated .gitattributes
Merge remote-tracking branch 'remotes/origin/master' into osx_port