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

merge
---

4a5fd61a916d0e6a129a8c1f9c85c5835edc8b72