merge with 3.5

diff --cc Doc/library/stdtypes.rst
Simple merge

diff --cc Lib/logging/__init__.py
Simple merge