Merge branch 'bw/mailmap'