From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 5 Nov 2015 19:29:19 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.1rc1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7931be403d6f616777e4a46cf43ee0bd21374889;p=python

Merge 3.4
---

7931be403d6f616777e4a46cf43ee0bd21374889