From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Tue, 2 Jun 2015 05:06:20 +0000 (-0600)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~2123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c976b730027914a2d72f34ca521b9f3d4e4a62bf;p=python

Merge from 3.5.
---

c976b730027914a2d72f34ca521b9f3d4e4a62bf