merge 3.2 (#9284)
diff --git a/Misc/NEWS b/Misc/NEWS
index 5b3a372..e2538fc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -190,6 +190,9 @@
 - Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files.
   Original patch by Erik Bray.
 
+- Issue #9284: Allow inspect.findsource() to find the source of doctest
+  functions.
+
 - Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a
   compatibility helper for the distutils-packaging transition.  Original patch
   by Erik Bray.