From: Raymond Hettinger <python@rcn.com>
Date: Fri, 30 Dec 2016 06:49:41 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.7.0a1~1660
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d8fcfe0f50cf0ca7039182152fd7ff3032ea7fd;p=python

merge
---

3d8fcfe0f50cf0ca7039182152fd7ff3032ea7fd