.gitignore + .gitattributes
Merge remote-tracking branch 'origin/master' into unit-tests