From: Ned Deily <nad@python.org>
Date: Mon, 7 Mar 2016 19:52:46 +0000 (-0500)
Subject: Issue #26505: merge from 3.5
X-Git-Tag: v3.6.0a1~517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cd8883d27c59ad70366a59490f5ef6186d11522;p=python

Issue #26505: merge from 3.5
---

8cd8883d27c59ad70366a59490f5ef6186d11522