From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Sep 2015 05:23:31 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1583
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25a2afdb2d8ae35091eb258126dc5c963bcf70c9;p=python

Merge 3.5
---

25a2afdb2d8ae35091eb258126dc5c963bcf70c9