Merge branch 'ma/shortlog-revparse'