From: Larry Hastings <larry@hastings.org>
Date: Wed, 9 Sep 2015 14:00:54 +0000 (-0700)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~1624
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=334b4a3403c3a120418cb42052ebfd9277d9b3b9;p=python

Merge from 3.5.
---

334b4a3403c3a120418cb42052ebfd9277d9b3b9