From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 3 Jun 2015 02:43:37 +0000 (-0600)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~2114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d14de5e22d6bb24740a7db5e0e85fb7a2c43b51b;p=python

Merge from 3.5.
---

d14de5e22d6bb24740a7db5e0e85fb7a2c43b51b