Code

Merge branch 'rs/git-dir-cleanup'