Merge branch 'sp/shortlog-missing-lf' into maint