Merge updates

diff --cc Misc/NEWS
index a36abac5950224de519952a63e32bd61c97445c6,af8fb292c83cc129d8433489eb4efdd1630abe3a..021bcf15c2baee00ea1150313befc90d8ce2242d
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -51,8 -51,8 +51,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.