Code

Merge branch 'aw/maint-shortlog-blank-lines'