merge 3.2

diff --cc Doc/glossary.rst
Simple merge

diff --cc Doc/library/concurrent.futures.rst
Simple merge

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

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

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

diff --cc Doc/reference/datamodel.rst
Simple merge

diff --cc Doc/reference/expressions.rst
Simple merge

diff --cc Doc/tutorial/classes.rst
Simple merge

diff --cc Doc/whatsnew/3.0.rst
Simple merge

diff --cc Lib/platform.py
Simple merge

diff --cc Lib/test/test_runpy.py
Simple merge