Merge branch 'jc/post-c89-rules-doc' into maint