Code

Merge branch 'jn/shortlog' into maint