Merge branch 'mb/shortlog-nongit-stdin'