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

Issue #24079: merge from 3.5
---

84086acb475a1fc7095c733b6a8bb523d623fa16