Merge branch 'rs/mailmap-himself'