From: Ned Deily <nad@acm.org>
Date: Tue, 18 Aug 2015 02:11:57 +0000 (-0400)
Subject: Issue #24079: merge from 3.4
X-Git-Tag: v3.6.0a1~1769^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d61714d236138ac7dc0228ee90314dfa8c3cc04d;p=python

Issue #24079: merge from 3.4
---

d61714d236138ac7dc0228ee90314dfa8c3cc04d