Issue #24324: merge from 3.5

author Ned Deily <nad@python.org>

Tue, 8 Mar 2016 05:40:12 +0000 (00:40 -0500)

committer Ned Deily <nad@python.org>

Tue, 8 Mar 2016 05:40:12 +0000 (00:40 -0500)
author Ned Deily <nad@python.org>
Tue, 8 Mar 2016 05:40:12 +0000 (00:40 -0500)
committer Ned Deily <nad@python.org>
Tue, 8 Mar 2016 05:40:12 +0000 (00:40 -0500)
diff --cc Misc/NEWS
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Ned Deily <nad@python.org>
	Tue, 8 Mar 2016 05:40:12 +0000 (00:40 -0500)
committer	Ned Deily <nad@python.org>
	Tue, 8 Mar 2016 05:40:12 +0000 (00:40 -0500)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history