From: Brett Cannon <brett@python.org>
Date: Fri, 4 Dec 2015 23:46:43 +0000 (-0800)
Subject: Merge for issue #23936
X-Git-Tag: v3.6.0a1~958
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa3e69e57f7a23b90d1ed121f6e5946e4b2c52bc;p=python

Merge for issue #23936
---

aa3e69e57f7a23b90d1ed121f6e5946e4b2c52bc