From: Ned Deily <nad@python.org>
Date: Wed, 24 Feb 2016 13:59:16 +0000 (+1100)
Subject: Issue #25136: merge from 3.5
X-Git-Tag: v3.6.0a1~575
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8da1a4feecc387b42d169be472e3a013cebdbc3;p=python

Issue #25136: merge from 3.5
---

b8da1a4feecc387b42d169be472e3a013cebdbc3