Andrey V. Elsukov <bu7cher@yandex.ru> provided an updated WITH_ENCODING_PATCH.
State Changed From-To: open->closed Committed, thanks!