Merge 3.5: Issue #26799

author Victor Stinner <victor.stinner@gmail.com>

Wed, 20 Apr 2016 16:12:38 +0000 (18:12 +0200)

committer Victor Stinner <victor.stinner@gmail.com>

Wed, 20 Apr 2016 16:12:38 +0000 (18:12 +0200)
author Victor Stinner <victor.stinner@gmail.com>
Wed, 20 Apr 2016 16:12:38 +0000 (18:12 +0200)
committer Victor Stinner <victor.stinner@gmail.com>
Wed, 20 Apr 2016 16:12:38 +0000 (18:12 +0200)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Wed, 20 Apr 2016 16:12:38 +0000 (18:12 +0200)
committer	Victor Stinner <victor.stinner@gmail.com>
	Wed, 20 Apr 2016 16:12:38 +0000 (18:12 +0200)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history