Code

Fix regression in handling of data for non-UTF-8 locales