Merge branch 'jk/shortlog-no-wrap-doc' into maint