From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Sep 2015 04:50:54 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1584
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c88acaae308ec79cb6e268c4ae69124cb42dbcf2;p=python

Merge 3.5
---

c88acaae308ec79cb6e268c4ae69124cb42dbcf2