Issue #25136: merge from 3.5

author Ned Deily <nad@python.org>

Wed, 24 Feb 2016 13:59:16 +0000 (00:59 +1100)

committer Ned Deily <nad@python.org>

Wed, 24 Feb 2016 13:59:16 +0000 (00:59 +1100)
author Ned Deily <nad@python.org>
Wed, 24 Feb 2016 13:59:16 +0000 (00:59 +1100)
committer Ned Deily <nad@python.org>
Wed, 24 Feb 2016 13:59:16 +0000 (00:59 +1100)
diff --cc Misc/NEWS
Simple merge
diff --cc setup.py
Simple merge
author	Ned Deily <nad@python.org>
	Wed, 24 Feb 2016 13:59:16 +0000 (00:59 +1100)
committer	Ned Deily <nad@python.org>
	Wed, 24 Feb 2016 13:59:16 +0000 (00:59 +1100)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
setup.py	patch \|	diff1 \|	diff2 \|	blob \| history