From: Raymond Hettinger <python@rcn.com>
Date: Sat, 31 Dec 2016 19:02:42 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.1rc1~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a67619ec5f0719daa14240469872ecff9596673e;p=python

merge
---

a67619ec5f0719daa14240469872ecff9596673e