From: Raymond Hettinger <python@rcn.com>
Date: Mon, 9 Jan 2017 02:22:41 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1600
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44844ccc066f44bc894db0ecbfb96fac0e2a25eb;p=python

merge
---

44844ccc066f44bc894db0ecbfb96fac0e2a25eb