Issue #21431: merge from 3.4
diff --git a/Doc/conf.py b/Doc/conf.py
index c0ed8c6..e1c0637 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -61,7 +61,7 @@
 # By default, highlight as Python 3.
 highlight_language = 'python3'
 
-needs_sphinx = '1.1'
+needs_sphinx = '1.2'
 
 
 # Options for HTML output