merge heads in 3.3

diff --cc Misc/NEWS
index 243c4da68aca3b7328d15414108c5b0528453d20,8b64f7973a938918150a4f1ffdde432e32cb2f40..742c86bae919b53bbf52b60fd2d031c1936e9844
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -193,10 -193,15 +193,19 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #17443: impalib.IMAP4_stream was using the default unbuffered IO
 +- Issue #17192: Update the ctypes module's libffi to v3.0.13.  This
 +  specifically addresses a stack misalignment issue on x86 and issues on
 +  some more recent platforms.
 +
+ - Issue #8862: Fixed curses cleanup when getkey is interrputed by a signal.
+ 
++- Issue #17443: imaplib.IMAP4_stream was using the default unbuffered IO
+   in subprocess, but the imap code assumes buffered IO.  In Python2 this
+   worked by accident.  IMAP4_stream now explicitly uses buffered IO.
+ 
+ - Issue #17476: Fixed regression relative to Python2 in undocumented pydoc
+   'allmethods'; it was missing unbound methods on the class.
+ 
  - Issue #16880: Do not assume _imp.load_dynamic() is defined in the imp module.
  
  - Issue #16389: Fixed a performance regression relative to Python 3.1 in the