Add gitattributes_global
Merge branch 'master' into mac