Merge branch 'rs/help-c-source-with-gitattributes' into maint