Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4