From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 2 Jul 2015 01:07:20 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2018
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15256ba8eeec8483279cbc55ca94b969f3a40c5d;p=python

Merge 3.5
---

15256ba8eeec8483279cbc55ca94b969f3a40c5d