Merge branch 'cr/git-work-tree-sans-git-dir'