From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 10 Sep 2015 23:02:34 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1593
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=977afe5ac1c7cbf5f0bbcf263ba338cd47470812;p=python

Merge 3.5
---

977afe5ac1c7cbf5f0bbcf263ba338cd47470812