From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 08:16:20 +0000 (-0700)
Subject: merge 3.5 (#25245)
X-Git-Tag: v3.6.0a1~1428
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2352a2f31d3530661c38f6f3e846d5636b2dfbf2;p=python

merge 3.5 (#25245)
---

2352a2f31d3530661c38f6f3e846d5636b2dfbf2