From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jul 2015 23:33:39 +0000 (-0700)
Subject: merge 3.4 (#24610)
X-Git-Tag: v3.5.0b4~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47066ee3db59e39d3567abf918d1fa621f9bca99;p=python

merge 3.4 (#24610)
---

47066ee3db59e39d3567abf918d1fa621f9bca99