From: Raymond Hettinger <python@rcn.com>
Date: Mon, 6 Feb 2017 15:15:57 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1400
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fa47469a9b1fc3436c783b766e07e9d7123f4eb;p=python

merge
---

0fa47469a9b1fc3436c783b766e07e9d7123f4eb