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

Merge 3.5
---

b1a3d9ae561b7b5a0bbbb47fad2f98448f1c7419