merge 3.3

diff --cc Misc/NEWS
index 332299a336a15210a49b89544802a5d26a7f85a2,347885fed141cedd07dca4dfffbee813e80e9c69..7c6a319fe40ce90357df27791731dde9a7f5444a
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,15 -12,13 +10,21 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 -- Issue #16197: Update winreg docstrings and documentation to match code.      
 +- Issue #16086: PyTypeObject.tp_flags and PyType_Spec.flags are now unsigned
 +  (unsigned long and unsigned int) to avoid an undefined behaviour with
 +  Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is
 +  now unsigned too (unsigned long, instead of long).
 +
+ - Fix segfaults on setting __qualname__ on builtin types and attempting to
+   delete it on any type.
+ 
 +- Issue #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch
 +  written by Serhiy Storchaka.
 +
+ - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
+   class's __dict__ and on type.
+ 
 +- Issue #16197: Update winreg docstrings and documentation to match code.
    Patch by Zachary Ware.
  
  - Issue #16241: Document -X faulthandler command line option.

diff --cc Objects/typeobject.c
Simple merge