merge 3.5 (#27774)

author Benjamin Peterson <benjamin@python.org>

Tue, 16 Aug 2016 05:05:16 +0000 (22:05 -0700)

committer Benjamin Peterson <benjamin@python.org>

Tue, 16 Aug 2016 05:05:16 +0000 (22:05 -0700)
author Benjamin Peterson <benjamin@python.org>
Tue, 16 Aug 2016 05:05:16 +0000 (22:05 -0700)
committer Benjamin Peterson <benjamin@python.org>
Tue, 16 Aug 2016 05:05:16 +0000 (22:05 -0700)
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/_sre.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Tue, 16 Aug 2016 05:05:16 +0000 (22:05 -0700)
committer	Benjamin Peterson <benjamin@python.org>
	Tue, 16 Aug 2016 05:05:16 +0000 (22:05 -0700)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_sre.c	patch \|	diff1 \|	diff2 \|	blob \| history