From: Brett Cannon <brett@python.org>
Date: Tue, 29 Dec 2015 01:18:21 +0000 (-0800)
Subject: Merge
X-Git-Tag: v3.6.0a1~849
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4783f4bc187c319e472834c54937a7f0efea9c2;p=python

Merge
---

b4783f4bc187c319e472834c54937a7f0efea9c2