Merge branch 'sa/cat-file-mailmap--batch-check'