Graft a89d654adaa2 from 3.2 branch. Fixes #15620.
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index 11045c8..945c7f4 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -12,6 +12,10 @@
 readline = import_module('readline')
 
 class TestHistoryManipulation (unittest.TestCase):
+
+    @unittest.skipIf(not hasattr(readline, 'clear_history'),
+                     "The history update test cannot be run because the "
+                     "clear_history method is not available.")
     def testHistoryUpdates(self):
         readline.clear_history()
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 1f098d4..96dd837 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -74,6 +74,7 @@
 Steven Bethard
 Stephen Bevan
 Ron Bickers
+Natalia B. Bidart
 David Binger
 Dominic Binks
 Philippe Biondi