Merge branch 'js/shortlog'