From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 4 Aug 2015 19:37:58 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1844
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb69843587369156487da26fa4a8148630785865;p=python

Merge 3.5
---

cb69843587369156487da26fa4a8148630785865