Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6