From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 9 Sep 2015 02:40:45 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1633
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b82a99a64d3ef9ffd407e69be92a14ad482a925;p=python

Merge 3.5
---

9b82a99a64d3ef9ffd407e69be92a14ad482a925