From: Raymond Hettinger <python@rcn.com>
Date: Sat, 31 Dec 2016 19:03:16 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.7.0a1~1654
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4825f49ea59e6a7694d50489e3fd3cc6b51d4fa4;p=python

merge
---

4825f49ea59e6a7694d50489e3fd3cc6b51d4fa4