From: Brett Cannon <brett@python.org>
Date: Tue, 29 Dec 2015 01:30:57 +0000 (-0800)
Subject: Merge for backport  of fix for issue #25930
X-Git-Tag: v3.6.0a1~845
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53d1f24408efd8317c0ebea42cd42e1735d54310;p=python

Merge for backport  of fix for issue #25930
---

53d1f24408efd8317c0ebea42cd42e1735d54310