From: Larry Hastings <larry@hastings.org>
Date: Fri, 20 Jan 2017 02:46:07 +0000 (-0800)
Subject: Null merge from 3.6.
X-Git-Tag: v3.7.0a1~1502
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c75d8ae4dc20ef8e665b77d7698e21e68bd1826;p=python

Null merge from 3.6.
---

3c75d8ae4dc20ef8e665b77d7698e21e68bd1826