From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 4 Jul 2014 12:07:31 +0000 (+0300)
Subject: Merge from 3.4.
X-Git-Tag: v3.5.0a1~1349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5b5f54832bf039405b31ace15b3d10327daae62;p=python

Merge from 3.4.
---

d5b5f54832bf039405b31ace15b3d10327daae62