Merge branch 'js/mailmap'