From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Aug 2015 19:16:54 +0000 (-0700)
Subject: merge 3.5 (#24217)
X-Git-Tag: v3.6.0a1~1856
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38768b23ae81f74ee98bb5e8d097551ed29624b5;p=python

merge 3.5 (#24217)
---

38768b23ae81f74ee98bb5e8d097551ed29624b5