Merge branch 'upstream-GitSetup' into developer-setup

* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)

GitSetup/.gitattributes

+.git*            export-ignore
+.gitattributes  -export-ignore
+
+config*          eol=lf         whitespace=indent-with-non-tab
+git-*            eol=lf         whitespace=indent-with-non-tab
+tips             eol=lf         whitespace=indent-with-non-tab
+setup-*          eol=lf         whitespace=indent-with-non-tab