Merged Upstream core/text/__init__.py