From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 17 Dec 2015 00:31:40 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.6.0a1~904^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=631546cf929098acf254d9eee4d3da39c6ed3444;p=python

Merge 3.4
---

631546cf929098acf254d9eee4d3da39c6ed3444