merge 3.6 (#28081)

author Benjamin Peterson <benjamin@python.org>

Wed, 14 Sep 2016 05:55:19 +0000 (22:55 -0700)

committer Benjamin Peterson <benjamin@python.org>

Wed, 14 Sep 2016 05:55:19 +0000 (22:55 -0700)
author Benjamin Peterson <benjamin@python.org>
Wed, 14 Sep 2016 05:55:19 +0000 (22:55 -0700)
committer Benjamin Peterson <benjamin@python.org>
Wed, 14 Sep 2016 05:55:19 +0000 (22:55 -0700)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Wed, 14 Sep 2016 05:55:19 +0000 (22:55 -0700)
committer	Benjamin Peterson <benjamin@python.org>
	Wed, 14 Sep 2016 05:55:19 +0000 (22:55 -0700)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history