Merge "fix incorrect unicode usage when using Spanish"