Merge branch 'jc/shortlog-ref-exclude' into maint