Merge branch 'uk/maint-shortlog-encoding'