Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11