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

Merge from 3.5.
---

ec6cd162de1b67c817a6d60856988e796db8c5dd