From: Larry Hastings <larry@hastings.org>
Date: Mon, 2 Jan 2017 05:51:09 +0000 (-0800)
Subject: Null merge from 3.6.
X-Git-Tag: v3.7.0a1~1639
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e597dfdb5c149eace0ba270c67bc4f5f5dc3d389;p=python

Null merge from 3.6.
---

e597dfdb5c149eace0ba270c67bc4f5f5dc3d389