From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 28 May 2015 19:31:14 +0000 (-0500)
Subject: merge 3.5 (#11205)
X-Git-Tag: v3.5.0b2~13^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ec8f9bffc952a2ebc17b91787298be1180e517f;p=python

merge 3.5 (#11205)
---

2ec8f9bffc952a2ebc17b91787298be1180e517f