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

Merge from 3.5.
---

f02dcc8803268d9f43aa42a36870766c3318d891