#15902: merge w/ 3.3

diff --cc Lib/test/test_imp.py
Simple merge

diff --cc Misc/NEWS
index bc98c0d85bcea19652ca88994d12eee1c220d71d,e4a92bf2b49458f12970b9e9ef82690ac616f238..5682eceacf9a833cdfb7bdb6e40c8eae3561b653
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -60,14 -44,18 +60,17 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #15902: Fix imp.load_module() accepting None as a file when loading an
 -  extension module.
++ - Issue #15902: Fix imp.load_module() accepting None as a file when loading an
++   extension module.
+ 
 -- Issue #17802: Fix an UnboundLocalError in html.parser.  Initial tests by
 -  Thomas Barlow.
 +- Issue #13721: SSLSocket.getpeercert() and SSLSocket.do_handshake() now
 +  raise an OSError with ENOTCONN, instead of an AttributeError, when the
 +  SSLSocket is not connected.
  
 -- Issue #15535: Fix namedtuple pickles which were picking up the OrderedDict
 -  instead of just the underlying tuple.
 +- Issue #14679: add an __all__ (that contains only HTMLParser) to html.parser.
  
 -- Issue #17192: Restore the patch for Issue #11729 which was ommitted in
 -  3.3.1 when updating the bundled version of libffi used by ctypes.  Update
 -  many libffi files that were missed in 3.3.1's update to libffi-3.0.13.
 +- Issue #17802: Fix an UnboundLocalError in html.parser.  Initial tests by
 +  Thomas Barlow.
  
  - Issue #17358: Modules loaded by imp.load_source() and load_compiled() (and by
    extention load_module()) now have a better chance of working when reloaded.