From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 22 Mar 2016 05:31:24 +0000 (-0700)
Subject: merge 3.4 (#17167)
X-Git-Tag: v3.6.0a1~412^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e46487b1331d50faffce480a4060bed1c4e634ae;p=python

merge 3.4 (#17167)
---

e46487b1331d50faffce480a4060bed1c4e634ae