Merge heads.

diff --cc Misc/NEWS
index 9539d62e13fdff48e55084885eea5c60b06f6732,419a1447f520389ffaa676af62f66dfcb66fabc4..958fadbec520866f673e2d9bc00d80ab2307f123
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -54,12 -54,8 +54,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16826: Don't check for PYTHONCASEOK if interpreter started with -E.
+ 
 +- Issue #18901: The sunau getparams method now returns a namedtuple rather than
 +  a plain tuple.  Patch by Claudiu Popa.
 +
 +- Issue #17487: The result of the wave getparams method now is pickleable again.
 +  Patch by Claudiu Popa.
 +
  - Issue #18756: os.urandom() now uses a lazily-opened persistent file
    descriptor, so as to avoid using many file descriptors when run in
    parallel from multiple threads.