merge 3.5 (#25131)

author Benjamin Peterson <benjamin@python.org>

Sat, 26 Sep 2015 05:44:55 +0000 (22:44 -0700)

committer Benjamin Peterson <benjamin@python.org>

Sat, 26 Sep 2015 05:44:55 +0000 (22:44 -0700)
author Benjamin Peterson <benjamin@python.org>
Sat, 26 Sep 2015 05:44:55 +0000 (22:44 -0700)
committer Benjamin Peterson <benjamin@python.org>
Sat, 26 Sep 2015 05:44:55 +0000 (22:44 -0700)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/ast.c
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Sat, 26 Sep 2015 05:44:55 +0000 (22:44 -0700)
committer	Benjamin Peterson <benjamin@python.org>
	Sat, 26 Sep 2015 05:44:55 +0000 (22:44 -0700)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/ast.c	patch \|	diff1 \|	diff2 \|	blob \| history