Merge fix for issue #11501

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

diff --cc Misc/NEWS
index 018c62d8c8b2b5b539ef7f684d070b428dbcf981,6501b15e9bc6cc7d8e8197f8d8ab01bfb64b9b4c..ca41e5391b8b801e9c1d37d6dfaa93a0d30b4402
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -68,20 -34,15 +68,24 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is
+   not installed. Instead, the zipfile.ZIP_STORED compression is used to create
+   the ZipFile. Patch by Natalia B. Bidart.
+ 
 +- Issue #11289: `smtp.SMTP` class becomes a context manager so it can be used
 +  in a `with` statement.  Contributed by Giampaolo Rodola.
 +
  - Issue #11554: Fixed support for Japanese codecs; previously the body output
    encoding was not done if euc-jp or shift-jis was specified as the charset.
  
- - Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified 
-   IP addresses in the proxy exception list. 
 +- Issue #11509: Significantly increase test coverage of fileinput.
 +  Patch by Denver Coneybeare at PyCon 2011 Sprints.
 +
 +- Issue #11407: `TestCase.run` returns the result object used or created.
 +  Contributed by Janathan Hartley.
 +
 -  IP addresses in the proxy exception list. 
+ - Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified
++  IP addresses in the proxy exception list.
  
  - Issue #11491: dbm.error is no longer raised when dbm.open is called with
    the "n" as the flag argument and the file exists. The behavior matches