From: Raymond Hettinger <python@rcn.com>
Date: Fri, 20 Jan 2017 05:39:55 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1500
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aecbef408d178d387fabfb0eda28e3f0221c9dd7;p=python

merge
---

aecbef408d178d387fabfb0eda28e3f0221c9dd7