Merge branch 'jk/shortlog'