Code

Merge branch 'jc/maint-format-patch'