From: Ned Deily <nad@acm.org>
Date: Tue, 2 Jun 2015 01:57:03 +0000 (-0700)
Subject: Issue #24357: merge from 3.5
X-Git-Tag: v3.6.0a1~2127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc50ab94b681f354b78647b72fc9fad5fe0f098d;p=python

Issue #24357: merge from 3.5
---

cc50ab94b681f354b78647b72fc9fad5fe0f098d