Merge branch 'sg/mailmap-self'