Merge branch 'jk/t1006-cat-file-objectsize-disk' into maint-2.43