Merge branch 'jk/mailmap-cleanup' into maint