Merge in r66135. Doing also required removing a stale DeprecationWarning along
with moving warnings.catch_warnings() over to keyword-only parameters for its
constructor (as documented in the 2.6 docs).
diff --git a/Misc/NEWS b/Misc/NEWS
index 5947aeb..5290a83 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,9 @@
Library
-------
+- Issue 3602: As part of the merge of r66135, make the parameters on
+ warnings.catch_warnings() keyword-only. Also remove a DeprecationWarning.
+
- The deprecation warnings for the camelCase threading API names were removed.
Extension Modules