Merge commit '6b1ab2572ed114beba07230f6fa9c02519cf27df' * commit '6b1ab2572ed114beba07230f6fa9c02519cf27df': Fix strings.