Merge changes from master, and strings.