From: Larry Hastings <larry@hastings.org>
Date: Fri, 20 Jan 2017 02:45:20 +0000 (-0800)
Subject: Null merge from 3.5.
X-Git-Tag: v3.6.1rc1~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc4dbdae1534cf20635b44ce96e1c00d77747721;p=python

Null merge from 3.5.
---

dc4dbdae1534cf20635b44ce96e1c00d77747721