merge 3.5 (#25630)

author Benjamin Peterson <benjamin@python.org>

Mon, 16 Nov 2015 05:57:50 +0000 (21:57 -0800)

committer Benjamin Peterson <benjamin@python.org>

Mon, 16 Nov 2015 05:57:50 +0000 (21:57 -0800)
author Benjamin Peterson <benjamin@python.org>
Mon, 16 Nov 2015 05:57:50 +0000 (21:57 -0800)
committer Benjamin Peterson <benjamin@python.org>
Mon, 16 Nov 2015 05:57:50 +0000 (21:57 -0800)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/unicodeobject.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Mon, 16 Nov 2015 05:57:50 +0000 (21:57 -0800)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 16 Nov 2015 05:57:50 +0000 (21:57 -0800)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history