Merge branch 'et/pretty-format-c-auto' into maint