Merge branch 'jk/mailmap-cleanup'