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

Merge from 3.5.
---

e9dd08d08c587377fd28ce8839e77eca76daf9c0