From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 23 Jun 2015 19:10:21 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2054
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d396d53bc78179f30d2b9ec9b57decda5ea70b64;p=python

Merge 3.5
---

d396d53bc78179f30d2b9ec9b57decda5ea70b64