git attributes
Merge branch 'master' into ccap