merge 3.5 (#27670)

diff --cc configure
index f579ac0b488e3820d1a373ac1322f3cdde5f55ed,d45dd6546f1173afb641123c15fc3b1da2e77ab8..e06fce424accdef06056ce8a06f52b6ef4b6d9e6
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,8 -1,8 +1,8 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.69 for python 3.5.
 +# Generated by GNU Autoconf 2.69 for python 3.6.
  #
- # Report bugs to <http://bugs.python.org/>.
+ # Report bugs to <https://bugs.python.org/>.
  #
  #
  # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@@ -580,9 -580,9 +580,9 @@@ MAKEFLAGS
  # Identity of this package.
  PACKAGE_NAME='python'
  PACKAGE_TARNAME='python'
 -PACKAGE_VERSION='3.5'
 -PACKAGE_STRING='python 3.5'
 +PACKAGE_VERSION='3.6'
 +PACKAGE_STRING='python 3.6'
- PACKAGE_BUGREPORT='http://bugs.python.org/'
+ PACKAGE_BUGREPORT='https://bugs.python.org/'
  PACKAGE_URL=''
  
  ac_unique_file="Include/object.h"

diff --cc configure.ac
Simple merge