merge.  Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek.