Merge 3.5 (Issue #24400)

author Yury Selivanov <yselivanov@sprymix.com>

Fri, 3 Jul 2015 17:11:54 +0000 (13:11 -0400)

committer Yury Selivanov <yselivanov@sprymix.com>

Fri, 3 Jul 2015 17:11:54 +0000 (13:11 -0400)
author Yury Selivanov <yselivanov@sprymix.com>
Fri, 3 Jul 2015 17:11:54 +0000 (13:11 -0400)
committer Yury Selivanov <yselivanov@sprymix.com>
Fri, 3 Jul 2015 17:11:54 +0000 (13:11 -0400)
diff --cc Lib/test/test_collections.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Yury Selivanov <yselivanov@sprymix.com>
	Fri, 3 Jul 2015 17:11:54 +0000 (13:11 -0400)
committer	Yury Selivanov <yselivanov@sprymix.com>
	Fri, 3 Jul 2015 17:11:54 +0000 (13:11 -0400)
		1	2
Lib/test/test_collections.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history