merge 3.3 (#17610)

diff --cc Misc/NEWS
index c458b3cf0fd630b8aef13ea93642cdcd9c07cc7a,b941ae0317a48c8430ace87f4354ee07598917d5..abd4a4d2a8aa2f175fdb369d2138101f4f80f8bb
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,33 -12,34 +10,35 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 -- Issue #17357: Add missing verbosity output when using -v/-vv.
 +- Issue #17357: Add missing verbosity messages for -v/-vv that were lost during
 +  the importlib transition.
 +
+ - Issue #17610: Don't rely on non-standard behavior of the C qsort() function.
+ 
 +- Issue #17323: The "[X refs, Y blocks]" printed by debug builds has been
 +  disabled by default.  It can be re-enabled with the `-X showrefcount` option.
  
 -Library
 --------
 -
 -- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +- Issue #17522: Add the PyGILState_Check() API.
  
 -- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 -  raises an exception.
 +- Issue #16475: Support object instancing, recursion and interned strings
 +  in marshal
  
 -- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 +- Use the HTTPS PyPI url for upload, overriding any plain HTTP URL in pypirc.
  
 -- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 -  default values for the args and kwargs parameters.
 +- Issue #16795: On the ast.arguments object, unify vararg with varargannotation
 +  and kwarg and kwargannotation. Change the column offset of ast.Attribute to be
 +  at the attribute name.
  
 -- Issue #17526: fix an IndexError raised while passing code without filename to
 -  inspect.findsource().  Initial patch by Tyler Doyle.
 +- Issue #17434: Properly raise a SyntaxError when a string occurs between future
 +  imports.
  
 +- Issue #17117: Import and @importlib.util.set_loader now set __loader__ when
 +  it has a value of None or the attribute doesn't exist.
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #17327: Add PyDict_SetDefault.
  
 -*Release date: 07-Apr-2013*
 -
 -Core and Builtins
 ------------------
 +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
 +  error message has been removed.  Patch by Ram Rachum.
  
  - Issue #17328: Fix possible refleak in dict.setdefault.
  

diff --cc Objects/typeobject.c
Simple merge