Bug 49342: Use bugs.python.org/21315 patch to solve q-char encoding issues