From: Brett Cannon <brett@python.org>
Date: Wed, 7 Sep 2016 00:16:41 +0000 (-0700)
Subject: Merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aee52ccc8501402a77f27dc1de7859feff85e038;p=python

Merge
---

aee52ccc8501402a77f27dc1de7859feff85e038