Merge branch 'jk/commit-author-parsing'