Code

Merge branch 'jc/maint-commit-ignore-i-t-a' into maint