merge 3.3 (#27758)

author Benjamin Peterson <benjamin@python.org>

Sun, 14 Aug 2016 00:21:22 +0000 (17:21 -0700)

committer Benjamin Peterson <benjamin@python.org>

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