Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maint