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

Merge from 3.5.
---

97abf97e45007cd4e2c09c2bcde36da18fecc754