deps: merge stringencoding upstream changes