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

Issue #24357: merge from 3.4
---

36a6a6bb3cc3aad22d6e738ba62cd86f47173c17