From: Brett Cannon <brett@python.org>
Date: Fri, 9 Sep 2016 18:19:16 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.6.0b1~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6982a4f8f0339434fd8b8b0792f34f1426e70dfd;p=python

Merge
---

6982a4f8f0339434fd8b8b0792f34f1426e70dfd