From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 18 Jul 2015 18:00:00 +0000 (-0700)
Subject: merge 3.4 (#24655)
X-Git-Tag: v3.5.0b4~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec;p=python

merge 3.4 (#24655)
---

0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec