From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 1 Jul 2015 02:06:55 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2023
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d18f9854b4d7b9796ccc2302f14af68c6019b3c9;p=python

Merge 3.5
---

d18f9854b4d7b9796ccc2302f14af68c6019b3c9