Upstream merge

Run-up before development of cyrillic letters contrib package for string.js