Update typing.py and test_typing.py from upstream (https://github.com/python/typing) (merge 3.5->3.6)