Merge upstream typing.py changes from 3.5 branch.