From: Ned Deily <nad@acm.org>
Date: Tue, 2 Jun 2015 04:20:46 +0000 (-0700)
Subject: Issue #24357: merge from 3.4
X-Git-Tag: v3.5.0b3~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa1b47cc5a51095c43da5df0d6a042ec1f1b7d98;p=python

Issue #24357: merge from 3.4
---

fa1b47cc5a51095c43da5df0d6a042ec1f1b7d98