From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 8 Jan 2016 06:02:13 +0000 (-0800)
Subject: merge 3.5 (#26046)
X-Git-Tag: v3.6.0a1~812
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3407473f91a931f96f358aa724ee84c49545da45;p=python

merge 3.5 (#26046)
---

3407473f91a931f96f358aa724ee84c49545da45