From: Larry Hastings <larry@hastings.org>
Date: Mon, 2 Jan 2017 05:50:55 +0000 (-0800)
Subject: Null merge from 3.5.
X-Git-Tag: v3.6.1rc1~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=292275cad86f538a2192c8c4d3e3fd82b3c37f46;p=python

Null merge from 3.5.
---

292275cad86f538a2192c8c4d3e3fd82b3c37f46