merge from 3.3

diff --cc Doc/library/imp.rst
index 5253e69449d4b546fb19556b4a2d5d776172fea9,ebdbd4d443c1cc2dc1c976293db11b5274a64955..6647b9e5b768452b75ed9746427e0b0027e264bf
--- 1/Doc/library/imp.rst
--- 2/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@@ -179,9 -172,10 +179,13 @@@ This module provides an interface to th
     the class does not affect the method definitions of the instances --- they
     continue to use the old class definition.  The same is true for derived classes.
  
+    .. versionchanged:: 3.3
+       Relies on both ``__name__`` and ``__loader__`` being defined on the module
+       being reloaded instead of just ``__name__``.
+ 
 +   .. deprecated:: 3.4
 +      Use :func:`importlib.reload` instead.
 +
  
  The following functions are conveniences for handling :pep:`3147` byte-compiled
  file paths.