merge 3.2 (#12009)

diff --cc Misc/ACKS
index 900fae705ac1c6cfc2acab1eeaaa5333c8983221,d578c483f136a2a06c4a6781409edeec2b2b36e6..3cf269bab298f0569e5400d7216f9d841fec2108
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -641,9 -607,9 +641,10 @@@ Skip Montanar
  Paul Moore
  Derek Morr
  James A Morrison
 +Derek McTavish Mounce
  Pablo Mouzo
  Mher Movsisyan
+ Ruslan Mstoi
  Sjoerd Mullender
  Sape Mullender
  Michael Muller

diff --cc Misc/NEWS
Simple merge