From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Sat, 19 Apr 2014 06:14:54 +0000 (-0600)
Subject: Merge from 3.4.
X-Git-Tag: v3.5.0a1~1819
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31e9f7cb0f3c77e4350c296c5a1968ae6302cc33;p=python

Merge from 3.4.
---

31e9f7cb0f3c77e4350c296c5a1968ae6302cc33