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

Merge 3.5
---

45bc650499e46a74f96da82a1ca72074456bd84b