Merge branch 'jk/git-no-more-argv0-path-munging' into maint