Code

Merge branch 'jn/maint-c99-format'