Merge branch 'jn/remote-helpers-with-git-dir' into maint