git global attributes
Merge branch 'master' into ccap