From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 4 Jun 2015 15:10:36 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df43379c7de2b3be398f86fc3b9840f3c17316e8;p=python

Merge 3.5
---

df43379c7de2b3be398f86fc3b9840f3c17316e8