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

Merge 3.4
---

c3fcb9696cd1c1122329ef78b7c316b4249a848b