From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Sat, 30 May 2015 18:06:26 +0000 (-0600)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~2151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1edcb2242b5be3429f7a6bb05f92f714e891f82a;p=python

Merge from 3.5.
---

1edcb2242b5be3429f7a6bb05f92f714e891f82a