Merge changes Icfe92059,I65a9da89

* changes:
  Introduce a named constant for the ".git" directory extension
  Introduce a named constant for the .git directory.