merge heads

diff --cc Misc/NEWS
index c74107622a5a876f5118515f30e8a3f4f9789bb2,c76a852f0504212ec91a0fcc8256babb66348441..a2da8e03d0dafdeed287a2201946651a64287986
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -147,10 -118,8 +147,12 @@@ Librar
  IDLE
  ----
  
+ - Issue #17838: Allow sys.stdin to be reassigned.
+ 
 +- Issue #13495: Avoid loading the color delegator twice in IDLE.
 +
 +- Issue #17798: Allow IDLE to edit new files when specified on command line.
 +
  - Issue #14735: Update IDLE docs to omit "Control-z on Windows".
  
  - Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit().