Merge branch 'jk/shortlog-tolerate-broken-commit'