From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 25 Jun 2015 15:54:49 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b3~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f76628fa5dd9f5ab9786f3e2d572b01d9b860d58;p=python

Merge 3.4
---

f76628fa5dd9f5ab9786f3e2d572b01d9b860d58