Merge branch 'js/maint-pretty-mailmap' into maint