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

merge
---

ac7c5acf9b1e474adfae5da6841e0d4cb343d7e8