#15437, #15439: merge with 3.2.

diff --cc Misc/ACKS
index cf543685afdd4818c575ca6f59f3f5ffd148e92a,8519029784470e3e749397caaabd7766f0f0d3ab..2c17d6dddfb695cff46b55db8659f832eb3b9d26
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -11,11 -11,10 +11,13 @@@ Without you, I would've stopped workin
  PS: In the standard Python distribution, this file is encoded in UTF-8
  and the list is in rough alphabetical order by last names.
  
+ Aahz
+ Michael Abbott
 +Rajiv Abraham
  David Abrahams
 +Marc Abramowitz
  Ron Adam
 +Ali Afshar
  Jim Ahlstrom
  Farhan Ahmad
  Matthew Ahrens
@@@ -33,20 -36,21 +39,22 @@@ Pehr Anderso
  Erik Andersén
  Oliver Andrich
  Ross Andrus
 +Juancarlo Añez
  Jérémy Anger
  Jon Anglin
+ Heidi Annexstad
  Éric Araujo
  Alicia Arlen
  Jason Asbahr
  David Ascher
  Chris AtLee
 +Aymeric Augustin
+ Jesús Cea Avión
  John Aycock
 -Jan-Hein Bührman
  Donovan Baarda
  Attila Babo
 -Alfonso Baciero
  Marcin Bachry
 +Alfonso Baciero
  Dwayne Bailey
  Stig Bakken
  Greg Ball
@@@ -64,12 -69,12 +74,13 @@@ Richard Barra
  Cesar Eduardo Barros
  Des Barry
  Ulf Bartelt
+ Don Bashford
 +Pior Bastida
  Nick Bastin
  Jeff Bauer
 -Mike Bayer
  Michael R Bax
  Anthony Baxter
 +Mike Bayer
  Samuel L. Bayer
  Donald Beaudry
  David Beazley
@@@ -85,7 -90,7 +96,8 @@@ Alexander “Саша” Belopolsk
  Eli Bendersky
  Andrew Bennetts
  Andy Bensky
+ Bennett Benson
 +Ezra Berch
  Michel Van den Bergh
  Julian Berman
  Brice Berna
@@@ -100,7 -105,7 +112,8 @@@ Dominic Bink
  Philippe Biondi
  Stuart Bishop
  Roy Bixler
+ Jonathan Black
 +Renaud Blanch
  Mike Bland
  Martin Bless
  Pablo Bleyer
@@@ -109,14 -114,13 +122,15 @@@ Eric Blosso
  Finn Bock
  Paul Boddie
  Matthew Boedicker
+ Robin Boerdijk
  David Bolen
 -Forest Bond
  Gawain Bolton
 +Forest Bond
  Gregory Bond
 +Matias Bordese
  Jurjen Bos
  Peter Bosch
 +Dan Boswell
  Eric Bouck
  Thierry Bousch
  Sebastian Boving
@@@ -129,7 -134,7 +145,8 @@@ Erik Bra
  Brian Brazil
  Dave Brennan
  Tom Bridgman
 +Anthony Briggs
+ Keith Briggs
  Tobias Brink
  Richard Brodie
  Michael Broghton
@@@ -186,9 -189,10 +205,11 @@@ Matt Chishol
  Anders Chrigström
  Tom Christiansen
  Vadim Chugunov
+ Mauro Cicognini
  David Cinege
  Craig Citro
+ Gilles Civario
 +Chris Clark
  Mike Clarkson
  Andrew Clegg
  Brad Clements
@@@ -246,9 -246,9 +268,10 @@@ John DeGoo
  Ned Deily
  Vincent Delft
  Arnaud Delobelle
 +Konrad Delong
  Erik Demaine
  John Dennis
+ L. Peter Deutsch
  Roger Dev
  Philippe Devalkeneer
  Raghuram Devarakonda
@@@ -262,9 -262,9 +285,10 @@@ Daniel Dini
  Humberto Diogenes
  Yves Dionne
  Daniel Dittmar
 +Josip Djolonga
  Jaromir Dolecek
  Ismail Donmez
+ Robert Donohue
  Marcos Donolo
  Dima Dorfman
  Yves Dorfsman
@@@ -340,9 -337,8 +368,10 @@@ Michael Foor
  Amaury Forgeot d'Arc
  Doug Fort
  John Fouhy
 +Andrew Francis
+ Stefan Franke
  Martin Franklin
 +Bruce Frederiksen
  Robin Friedrich
  Bradley Froehle
  Ivan Frohne
@@@ -381,16 -378,17 +412,20 @@@ Dinu Gherma
  Jonathan Giddy
  Johannes Gijsbers
  Michael Gilfix
 +Yannick Gingras
+ Matt Giuca
 +Michael Goderbauer
  Christoph Gohlke
  Tim Golden
  Guilherme Gonçalves
 +Tiago Gonçalves
  Chris Gonnerman
+ Shelley Gooch
  David Goodger
  Hans de Graaff
+ Nathaniel Gray
  Eddy De Greef
+ Grant Griffin
  Duncan Grisby
  Fabian Groffen
  Eric Groo
@@@ -410,8 -407,9 +446,10 @@@ Walker Hale I
  Bob Halley
  Jesse Hallio
  Jun Hamano
 +Alexandre Hamelin
+ Anders Hammarquist
  Mark Hammond
+ Harald Hanche-Olsen
  Manus Hand
  Milton L. Hankins
  Stephen Hansen
@@@ -420,9 -418,11 +458,12 @@@ Lynda Hardma
  Derek Harland
  Jason Harper
  Brian Harring
 +Jonathan Hartley
+ Travis B. Hartwell
  Larry Hastings
+ Tim Hatch
  Shane Hathaway
+ Janko Hauser
  Rycharde Hawkes
  Ben Hayden
  Jochen Hayek
@@@ -507,14 -504,13 +552,16 @@@ Geert Janse
  Jack Jansen
  Bill Janssen
  Thomas Jarosch
 -Zbyszek Jędrzejewski-Szmek
 +Juhana Jauhiainen
 +Zbigniew Jędrzejewski-Szmek
 +Julien Jehannet
  Drew Jenkins
  Flemming Kjær Jensen
+ Philip H. Jensen
  MunSic Jeong
  Chris Jerdonek
 +Jim Jewett
+ Pedro Diaz Jimenez
  Orjan Johansen
  Fredrik Johansson
  Gregory K. Johnson
@@@ -548,13 -542,14 +596,15 @@@ Hiroaki Kawa
  Sebastien Keim
  Ryan Kelly
  Dan Kenigsberg
 -Robert Kern
  Randall Kern
 +Robert Kern
+ Jim Kerr
  Magnus Kessler
  Lawrence Kesteloot
  Vivek Khera
  Mads Kiilerich
 +Jason Killen
+ Jan Kim
  Taek Joo Kim
  W. Trevor King
  Paul Kippes
@@@ -575,11 -571,12 +626,14 @@@ Jeff Knup
  Greg Kochanski
  Damon Kohler
  Marko Kohtala
+ Guido Kollerie
 +Jacek Konieczny
 +Марк Коренберг
  Arkady Koplyarov
+ Peter A. Koren
  Vlad Korolev
  Joseph Koshy
+ Daniel Kozan
  Jerzy Kozera
  Maksim Kozyarchuk
  Stefan Krah
@@@ -593,12 -589,13 +647,15 @@@ Hannu Krosin
  Andrej Krpic
  Ivan Krstić
  Andrew Kuchling
+ Dave Kuhlman
 +Jon Kuhn
  Vladimir Kushnir
+ Erno Kuusela
  Ross Lagerwall
  Cameron Laird
+ Thomas Lamb
  Jean-Baptiste "Jiba" Lamy
 +Ronan Lamy
  Torsten Landschoff
  Łukasz Langa
  Tino Lange
@@@ -612,14 -608,14 +669,15 @@@ Simon La
  Julia Lawall
  Chris Lawrence
  Brian Leair
 +Mathieu Leduc-Hamel
 +Christopher Lee
 +Inyeol Lee
  James Lee
  John J. Lee
 -Inyeol Lee
  Thomas Lee
 -Christopher Lee
  Tennessee Leeuwenburg
  Luc Lefebvre
+ Glyph Lefkowitz
  Vincent Legoll
  Kip Lehman
  Joerg Lehmann
@@@ -627,10 -623,9 +685,10 @@@ Robert Lehman
  Petri Lehtinen
  Luke Kenneth Casson Leighton
  Tshepang Lekhonkhobe
- Marc-Andre Lemburg
+ Marc-André Lemburg
  John Lenton
  Christopher Tur Lesniewski-Laas
 +Alain Leufroy
  Mark Levinson
  William Lewis
  Akira Li
@@@ -645,9 -642,10 +705,11 @@@ Björn Lindqvis
  Per Lindqvist
  Eric Lindvall
  Gregor Lingl
+ Everett Lipman
+ Mirko Liss
  Nick Lockwood
  Stephanie Lockwood
 +Hugo Lopes Tavares
  Anne Lord
  Tom Loredo
  Justin Love
@@@ -661,7 -659,8 +723,9 @@@ Mark Lut
  Jim Lynch
  Mikael Lyngvig
  Martin von Löwis
 +Guillermo López-Anglada
+ Jeff MacDonald
+ John Machin
  Andrew I MacIntyre
  Tim MacKenzie
  Nick Maclaren
@@@ -671,21 -670,23 +735,26 @@@ Grzegorz Makarewic
  David Malcolm
  Ken Manheimer
  Vladimir Marangozov
 +Colin Marc
+ Vincent Marchetti
  David Marek
  Doug Marien
  Sven Marnach
  Alex Martelli
  Anthony Martin
  Owen Martin
+ Westley Martínez
  Sébastien Martini
 +Sidney San Martín
  Roger Masse
  Nick Mathewson
 +Simon Mathieu
+ Laura Matson
  Graham Matthews
  Dieter Maurer
+ Daniel May
  Arnaud Mazin
+ Rebecca McCreary
  Kirk McDonald
  Chris McDonough
  Greg McFarlane
@@@ -712,8 -712,9 +782,9 @@@ Tom Middleto
  Stan Mihai
  Stefan Mihaila
  Aristotelis Mikropoulos
 -Damien Miller
+ Paolo Milani
  Chad Miller
 +Damien Miller
  Jason V. Miller
  Jay T. Miller
  Roman Milner
@@@ -726,22 -725,21 +797,24 @@@ Florian Mladitsc
  Doug Moen
  The Dragon De Monsyne
  Skip Montanaro
 +Peter Moody
  Paul Moore
+ Ross Moore
  Derek Morr
  James A Morrison
 +Derek McTavish Mounce
  Alessandro Moura
  Pablo Mouzo
  Mher Movsisyan
  Ruslan Mstoi
 -Sjoerd Mullender
 +Michael Mulich
  Sape Mullender
 +Sjoerd Mullender
  Michael Muller
  Neil Muller
 +Louis Munro
  R. David Murray
 -Piotr Meyer
+ Dale Nagata
  John Nagle
  Takahiro Nakayama
  Travers Naran
@@@ -773,8 -770,7 +846,9 @@@ Nigel O'Bria
  John O'Connor
  Kevin O'Connor
  Tim O'Malley
+ Zooko O'Whielacronx
 +James Oakley
 +Jon Oberheide
  Pascal Oberndoerfer
  Jeffrey Ollie
  Adam Olsen
@@@ -798,8 -798,9 +876,10 @@@ M. Papillo
  Peter Parente
  Alexandre Parenteau
  Dan Parisien
+ William Park
  Harri Pasanen
 +Gaël Pasgrimaud
+ Bo Peng
  Joe Peterson
  Randy Pausch
  Samuele Pedroni
@@@ -818,7 -815,7 +898,8 @@@ Benjamin Peterso
  Joe Peterson
  Chris Petrilli
  Bjorn Pettersen
+ Justin D. Pettit
 +Ronny Pfannschmidt
  Geoff Philbrick
  Gavrie Philipson
  Adrian Phillips
@@@ -902,9 -891,8 +984,10 @@@ Mike Romber
  Armin Ronacher
  Case Roole
  Timothy Roscoe
 +Erik Rose
  Jim Roskind
 +Brian Rosner
+ Guido van Rossum
  Just van Rossum
  Hugo van Rossum
  Saskia van Rossum
@@@ -920,9 -908,9 +1003,11 @@@ Rauli Ruohone
  Jeff Rush
  Sam Rushing
  Mark Russell
 +Rusty Russell
  Nick Russo
+ Chris Ryland
+ Constantina S.
 +Patrick Sabin
  Sébastien Sablé
  Suman Saha
  Hajime Saitou
@@@ -962,8 -952,8 +1050,9 @@@ Nick Seidenma
  Yury Selivanov
  Fred Sells
  Jiwon Seo
 -Roger Serwy
 +Iñigo Serna
+ Joakim Sernbrant
 +Roger D. Serwy
  Jerry Seutter
  Denis Severson
  Ian Seyer
@@@ -977,41 -969,44 +1068,51 @@@ Michael Shiplet
  John W. Shipman
  Joel Shprentz
  Itamar Shtull-Trauring
+ Yue Shuaijie
  Eric Siegerman
  Paul Sijben
+ SilentGhost
  Tim Silk
+ Michael Simcich
+ Ionel Simionescu
  Kirill Simonov
  Nathan Paul Simons
 +Adam Simpkins
  Janne Sinkkonen
+ Ng Pheng Siong
  George Sipe
  J. Sipprell
  Kragen Sitaker
 -Eric V. Smith
+ Michael Sloan
  Christopher Smith
 +Eric V. Smith
  Gregory P. Smith
 +Mark Smith
+ Roy Smith
  Rafal Smotrzyk
 +Eric Snow
  Dirk Soede
  Paul Sokolovsky
  Cody Somerville
 +Edoardo Spadolini
  Clay Spence
  Stefan Sperling
+ Nicholas Spies
  Per Spilling
  Joshua Spoerri
  Noah Spurrier
  Nathan Srebro
  RajGopal Srinivasan
+ Tage Stabell-Kulo
  Quentin Stafford-Fraser
  Frank Stajano
 +Joel Stanley
+ Anthony Starks
  Oliver Steele
  Greg Stein
 +Baruch Sterin
  Chris Stern
 +Alex Stewart
  Victor Stinner
  Richard Stoakley
  Peter Stoehr
@@@ -1056,10 -1052,10 +1158,11 @@@ Tracy Tim
  Oren Tirosh
  Jason Tishler
  Christian Tismer
+ Jim Tittsler
  Frank J. Tobin
 -R Lindsay Todd
  Bennett Todd
 +R Lindsay Todd
 +Eugene Toder
  Erik Tollerud
  Matias Torchinsky
  Sandro Tosi
@@@ -1100,9 -1095,9 +1205,10 @@@ John Vieg
  Kannan Vijayan
  Kurt Vile
  Norman Vine
 +Pauli Virtanen
  Frank Visser
  Johannes Vogel
+ Martijn Vries
  Sjoerd de Vries
  Niki W. Waibel
  Wojtek Walczak
@@@ -1134,8 -1131,8 +1242,9 @@@ Felix Wieman
  Gerry Wiener
  Frank Wierzbicki
  Bryce "Zooko" Wilcox-O'Hearn
+ Timothy Wild
  Jakub Wilk
 +Gerald S. Williams
  Jason Williams
  John Williams
  Sue Williams
@@@ -1158,8 -1157,9 +1268,9 @@@ Klaus-Juergen Wol
  Dan Wolfe
  Richard Wolff
  Adam Woodbeck
 -Darren Worrall
+ Steven Work
  Gordon Worley
 +Darren Worrall
  Thomas Wouters
  Heiko Wundram
  Doug Wyatt
@@@ -1168,9 -1168,9 +1279,10 @@@ Florent Xiclun
  Hirokazu Yamamoto
  Ka-Ping Yee
  Jason Yeo
 +EungJun Yi
  Bob Yodlowski
  Danny Yoo
+ Rory Yorke
  George Yoshida
  Masazumi Yoshikawa
  Arnaud Ysmal