Issue #24400: Merge 3.5

author Yury Selivanov <yselivanov@sprymix.com>

Mon, 22 Jun 2015 16:31:24 +0000 (12:31 -0400)

committer Yury Selivanov <yselivanov@sprymix.com>

Mon, 22 Jun 2015 16:31:24 +0000 (12:31 -0400)
author Yury Selivanov <yselivanov@sprymix.com>
Mon, 22 Jun 2015 16:31:24 +0000 (12:31 -0400)
committer Yury Selivanov <yselivanov@sprymix.com>
Mon, 22 Jun 2015 16:31:24 +0000 (12:31 -0400)
diff --cc Misc/NEWS
Simple merge
diff --cc Python/compile.c
Simple merge
author	Yury Selivanov <yselivanov@sprymix.com>
	Mon, 22 Jun 2015 16:31:24 +0000 (12:31 -0400)
committer	Yury Selivanov <yselivanov@sprymix.com>
	Mon, 22 Jun 2015 16:31:24 +0000 (12:31 -0400)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Python/compile.c	patch \|	diff1 \|	diff2 \|	blob \| history