From: Brett Cannon <brett@python.org>
Date: Thu, 9 Jun 2016 23:59:13 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.6.0a2~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0053bebc2fd67f9f8223181980baae7bb0ccb62;p=python

Merge
---

a0053bebc2fd67f9f8223181980baae7bb0ccb62