From: Larry Hastings <larry@hastings.org>
Date: Tue, 3 Jan 2017 02:40:11 +0000 (-0800)
Subject: Null-merge from 3.6.  Last one--phew!
X-Git-Tag: v3.7.0a1~1632
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef29a05f9851ca37a4b63cb2889bc6ec0f0f9bb0;p=python

Null-merge from 3.6.  Last one--phew!
---

ef29a05f9851ca37a4b63cb2889bc6ec0f0f9bb0