From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sun, 2 Aug 2015 14:24:49 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.6.0a1~1857^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32ba405ce5ad9ee7c18c96a264c5db42817f7cb1;p=python

Merge 3.4
---

32ba405ce5ad9ee7c18c96a264c5db42817f7cb1