Merge branch 'sg/strbuf-addbuf-cocci'