Merge from 3.5.

author Eric Snow <ericsnowcurrently@gmail.com>

Wed, 3 Jun 2015 02:43:37 +0000 (20:43 -0600)

committer Eric Snow <ericsnowcurrently@gmail.com>

Wed, 3 Jun 2015 02:43:37 +0000 (20:43 -0600)
author Eric Snow <ericsnowcurrently@gmail.com>
Wed, 3 Jun 2015 02:43:37 +0000 (20:43 -0600)
committer Eric Snow <ericsnowcurrently@gmail.com>
Wed, 3 Jun 2015 02:43:37 +0000 (20:43 -0600)
diff --cc Lib/test/test_collections.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Eric Snow <ericsnowcurrently@gmail.com>
	Wed, 3 Jun 2015 02:43:37 +0000 (20:43 -0600)
committer	Eric Snow <ericsnowcurrently@gmail.com>
	Wed, 3 Jun 2015 02:43:37 +0000 (20:43 -0600)
		1	2
Lib/test/test_collections.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history