Merge branch 'jk/shortlog-ident-cleanup'