Merge branch 'jk/mailmap-from-blob'