From: Raymond Hettinger <python@rcn.com>
Date: Mon, 21 Nov 2016 18:52:20 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.7.0a1~1913
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46d8e3181e10c91d17fdbbc225664476cdf6c732;p=python

merge
---

46d8e3181e10c91d17fdbbc225664476cdf6c732