Merge branch 'ks/mailmap'