Merge 3.5

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

Tue, 1 Mar 2016 20:30:50 +0000 (21:30 +0100)

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

Tue, 1 Mar 2016 20:30:50 +0000 (21:30 +0100)
author Victor Stinner <victor.stinner@gmail.com>
Tue, 1 Mar 2016 20:30:50 +0000 (21:30 +0100)
committer Victor Stinner <victor.stinner@gmail.com>
Tue, 1 Mar 2016 20:30:50 +0000 (21:30 +0100)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/unicodeobject.c
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Tue, 1 Mar 2016 20:30:50 +0000 (21:30 +0100)
committer	Victor Stinner <victor.stinner@gmail.com>
	Tue, 1 Mar 2016 20:30:50 +0000 (21:30 +0100)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history