Merge branch 'ks/mailmap' into maint