Merge branch 'as/maint-shortlog-cleanup'