Merge 3.6.

author Xavier de Gaye <xdegaye@users.sourceforge.net>

Thu, 15 Dec 2016 20:01:52 +0000 (21:01 +0100)

committer Xavier de Gaye <xdegaye@users.sourceforge.net>

Thu, 15 Dec 2016 20:01:52 +0000 (21:01 +0100)
author Xavier de Gaye <xdegaye@users.sourceforge.net>
Thu, 15 Dec 2016 20:01:52 +0000 (21:01 +0100)
committer Xavier de Gaye <xdegaye@users.sourceforge.net>
Thu, 15 Dec 2016 20:01:52 +0000 (21:01 +0100)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/unicodeobject.c
Simple merge
author	Xavier de Gaye <xdegaye@users.sourceforge.net>
	Thu, 15 Dec 2016 20:01:52 +0000 (21:01 +0100)
committer	Xavier de Gaye <xdegaye@users.sourceforge.net>
	Thu, 15 Dec 2016 20:01:52 +0000 (21:01 +0100)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	patch \|	diff1 \|	diff2 \|	blob \| history