Merge for issue #28605

author Brett Cannon <brett@python.org>

Thu, 3 Nov 2016 23:21:11 +0000 (16:21 -0700)

committer Brett Cannon <brett@python.org>

Thu, 3 Nov 2016 23:21:11 +0000 (16:21 -0700)
author Brett Cannon <brett@python.org>
Thu, 3 Nov 2016 23:21:11 +0000 (16:21 -0700)
committer Brett Cannon <brett@python.org>
Thu, 3 Nov 2016 23:21:11 +0000 (16:21 -0700)
diff --cc Doc/whatsnew/3.6.rst
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Brett Cannon <brett@python.org>
	Thu, 3 Nov 2016 23:21:11 +0000 (16:21 -0700)
committer	Brett Cannon <brett@python.org>
	Thu, 3 Nov 2016 23:21:11 +0000 (16:21 -0700)
		1	2
Doc/whatsnew/3.6.rst	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history