From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 3 Jul 2015 05:16:20 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2008
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bbc3cc7603a3e5e530e0b6172af580d5106a5d4;p=python

Merge 3.5
---

4bbc3cc7603a3e5e530e0b6172af580d5106a5d4