From: Raymond Hettinger <python@rcn.com>
Date: Tue, 17 Jan 2017 06:44:14 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1534
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6b96c7bb59ac7bc97fc00a823e70de48b693d9a;p=python

merge
---

f6b96c7bb59ac7bc97fc00a823e70de48b693d9a