merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sun, 6 Nov 2016 21:01:15 +0000 (13:01 -0800)
committerBenjamin Peterson <benjamin@python.org>
Sun, 6 Nov 2016 21:01:15 +0000 (13:01 -0800)
1  2 
Objects/object.c

Simple merge