Tidy up merge with remote

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index dd5b3f5372f606c2954d350b5466e5e1e0d9c4e2,1bce6681c619eb908940b93259cbb0e4ab4ead9e..90c82a75b0cb637c1e23fd695652a445e58fd9e5
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -241,10 -133,9 +243,12 @@@ Tools/Demo
  
  Tests
  -----
+ 
+ - Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov.
  
 +- New test_crashers added to exercise the scripts in the Lib/test/crashers
 +  directory and confirm they fail as expected
 +
  - Issue #11578: added test for the timeit module.  Patch Michael Henry.
  
  - Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea.