Merge branch 'jc/commit-hook-authorship' into maint