Merge branch 'nd/strbuf-inline-styles'