Merge further typing.py changes from upstream.
2 files changed