merge heads

diff --cc Misc/NEWS
index 2fe06ed5b60acc7c374ab35e843ba300d46e07da,52cb82594ec3df967a93427082725f5b9fd85c1f..37966c73542d67d68a15eec4688b454861dea58c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -37,11 -30,9 +37,11 @@@ Core and Builtin
  - Issue #12546: Allow \x00 to be used as a fill character when using str, int,
    float, and complex __format__ methods.
  
 +- Issue #20480: Add ipaddress.reverse_pointer. Patch by Leon Weber.
 +
  - Issue #13598: Modify string.Formatter to support auto-numbering of 
    replacement fields. It now matches the behavior of str.format() in
-   this regard.
+   this regard. Patches by Phil Elson and Ramchandra Apte.
  
  Library
  -------