From: Raymond Hettinger <python@rcn.com>
Date: Wed, 31 Aug 2016 22:01:28 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.6.0b1~508
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=112835cb3e8423046a21e427d050f3e3fefe622b;p=python

Merge
---

112835cb3e8423046a21e427d050f3e3fefe622b