Merge branch 'jc/commit-s-subject-is-not-a-footer'