Code

Merge branch 'jc/maint-log-first-parent-pathspec' into maint