From: Larry Hastings <larry@hastings.org>
Date: Mon, 23 Nov 2015 07:46:02 +0000 (-0800)
Subject: Null merge from 3.5.
X-Git-Tag: v3.6.0a1~1001
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21dbc50f115c0785bd433096ab31233acedefc7f;p=python

Null merge from 3.5.
---

21dbc50f115c0785bd433096ab31233acedefc7f