From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 13 May 2015 19:16:18 +0000 (-0400)
Subject: Merge 3.4.
X-Git-Tag: v3.5.0b1~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53ffdbd6f0fc18e2a58a949233626b91e4988b29;p=python

Merge 3.4.
---

53ffdbd6f0fc18e2a58a949233626b91e4988b29