From: Raymond Hettinger <python@rcn.com>
Date: Mon, 21 Nov 2016 22:34:51 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1908
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6088cfcfd4be60930aee8c06ca6e72e0f29edef6;p=python

merge
---

6088cfcfd4be60930aee8c06ca6e72e0f29edef6