From: Brett Cannon <brett@python.org>
Date: Fri, 18 Sep 2015 22:21:22 +0000 (-0700)
Subject: Merge for issue #25133
X-Git-Tag: v3.6.0a1~1517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6631b550d68789bce9fe2536e501539d7b649042;p=python

Merge for issue #25133
---

6631b550d68789bce9fe2536e501539d7b649042