Merge branch 'nd/init-gitdir'