From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 30 Jun 2015 16:51:29 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2028
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2c42c2a8f308626bba43db31a78907bf6e07dc3;p=python

Merge 3.5
---

b2c42c2a8f308626bba43db31a78907bf6e07dc3