Merge branch 'jn/shortlog'