From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Dec 2015 16:34:11 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.6.0a1~926^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3ded40a53df40c5dd9c1fd05c886bfe91df4aee;p=python

Merge 3.4
---

d3ded40a53df40c5dd9c1fd05c886bfe91df4aee