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

Merge from 3.5.
---

6e15fdfdec586867da1214341afb326389c48442