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

Merge
---

73224c4248f0de8f30c70390b4ad54a5d62f656c