From: Brett Cannon <brett@python.org>
Date: Thu, 22 Dec 2016 18:02:28 +0000 (-0800)
Subject: Merge
X-Git-Tag: v3.7.0a1~1699
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb8ebaaaf0923e7946709bd9fc914249745a0d2d;p=python

Merge
---

eb8ebaaaf0923e7946709bd9fc914249745a0d2d