Merge from 3.1

diff --cc Misc/NEWS
index 7fa8ed7c8ff42f66067a492219b85e5af09753ea,f065b5a99b0d680d8717e7ab79e6592cc96cd5a4..b8b65d249dbf32c9d118dc38cd39aa2b68c7bf8e
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -85,17 -68,16 +85,20 @@@ Core and Builtin
  
  Library
  -------
 -
+ - Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError.
+   With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused
+   IDLE to exit.  Converted to valid Unicode null in PythonCmd().
  
 -- Issue #10419: Fix build_scripts command of distutils to handle correctly
 -  non-ASCII scripts. Open and write the script in binary mode, but ensure that
 -  the shebang is decodable from UTF-8 and from the encoding of the script.
 +- Issue #11169: compileall module uses repr() to format filenames and paths to
 +  escape surrogate characters and show spaces.
  
 -- Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional.
 +- Issue #10419, #6011: build_scripts command of distutils handles correctly
 +  non-ASCII path (path to the Python executable). Open and write the script in
 +  binary mode, but ensure that the shebang is decodable from UTF-8 and from the
 +  encoding of the script.
 +
 +- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in
 +  order to accept exactly one connection.  Patch by Daniel Evers.
  
  - Issue #11164: Stop trying to use _xmlplus in the xml module.
  

diff --cc Modules/_tkinter.c
Simple merge