From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 19 Aug 2015 13:53:41 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1752
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df6f8bf47b9801c9808a595f8133be3cf6949eb6;p=python

Merge 3.5
---

df6f8bf47b9801c9808a595f8133be3cf6949eb6