merge update

diff --cc Misc/NEWS
index 300e46dd4932f64f1bfa532d1748291c8dffa1b4,af3ad9ac9a61730736082f4d42c9bfd30af56598..7dd4c409a5ad8085cc6b31421a2f16497bf26053
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -53,8 -53,8 +53,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #11703 - urllib2.geturl() does not return correct url when the original
 +  url contains #fragment.
++  
+ - Issue #10019: Fixed regression in json module where an indent of 0 stopped
+   adding newlines and acted instead like 'None'.
  
  - Issue #5162: Treat services like frozen executables to allow child spawning
    from multiprocessing.forking on Windows.