add Tom Tromey to ACKS
#16748: test_heapq now works with unittest test discovery.
#16747: fix link to file objects in the glossary.
#16747: merge with 3.2.
Issue #16828: Fix error incorrectly raised by bz2.compress('').

Patch by Martin Packman.
Issue #16828: Fix error incorrectly raised by bz2.compress('').

Initial patch by Martin Packman.
Correction: issue #16828 also affects BZ2Compressor.compress().
Issue #16455: On FreeBSD and Solaris, if the locale is C, the
ASCII/surrogateescape codec is now used, instead of the locale encoding, to
decode the command line arguments. This change fixes inconsistencies with
os.fsencode() and os.fsdecode() because these operating systems announces an
ASCII locale encoding, whereas the ISO-8859-1 encoding is used in practice.
(Merge 3.2) Issue #16455: On FreeBSD and Solaris, if the locale is C, the
ASCII/surrogateescape codec is now used, instead of the locale encoding, to
decode the command line arguments. This change fixes inconsistencies with
os.fsencode() and os.fsdecode() because these operating systems announces an
ASCII locale encoding, whereas the ISO-8859-1 encoding is used in practice.
Issue #16218, #16414, #16444: Backport FS_NONASCII, TESTFN_UNDECODABLE,
TESTFN_NONASCII of test.support from Python 3.4. Backport tests on non-ASCII
paths.
(Merge 3.2) Issue #16218, #16414, #16444: Backport FS_NONASCII,
TESTFN_UNDECODABLE, TESTFN_NONASCII of test.support from Python 3.4. Backport
tests on non-ASCII paths.
issue 10527: fix missing import
Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB
(Merge 3.2) Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB.
Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in
non-pydebug builds. Several extension modules now compile cleanly when
assert()s are enabled in standard builds (-DDEBUG flag).