From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 1 Jul 2015 16:30:26 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2020
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9dbd4790a3f74105b4bf9cacc1ce5d99f55b2968;p=python

Merge 3.5
---

9dbd4790a3f74105b4bf9cacc1ce5d99f55b2968