From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Oct 2014 01:20:51 +0000 (-0400)
Subject: merge 3.4 (#18494)
X-Git-Tag: v3.5.0a1~748
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fe8ada4e560816e972d275bb2bef225abe1aa1d;p=python

merge 3.4 (#18494)
---

1fe8ada4e560816e972d275bb2bef225abe1aa1d