Merge branch 'rr/shortlog-doc'