From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 24 Jun 2015 13:42:08 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2051
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b64b42852a2e30310e52cfb2976b237810049cd4;p=python

Merge 3.5
---

b64b42852a2e30310e52cfb2976b237810049cd4