Code

Merge branch 'jc/commit-amend-no-edit'