merge

diff --cc Misc/NEWS
index 2f424e6e26e6ec0323882addf213b996c8d1ef7b,13be4bba269c11b1eaefb96e7b3373e9395704ca..7843459c34983ce8f20324ae2a62a304cab48812
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -24,10 -24,10 +24,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem.
+ 
  - Issue #11199: Fix the with urllib which hangs on particular ftp urls.
  
 +- Improve the memory utilization and speed of functools.lru_cache.
 +
  - Issue #14222: Use the new time.steady() function instead of time.time() for
    timeout in queue and threading modules to not be affected of system time
    update.