From: Raymond Hettinger <python@rcn.com>
Date: Tue, 22 Nov 2016 00:31:32 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1904
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1330eaa9064254203186575579e16fb9fbae2ff8;p=python

merge
---

1330eaa9064254203186575579e16fb9fbae2ff8