From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 23 Jun 2015 15:46:26 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~2055
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebbd83e70ddfac4798fe7712f0a3bce22ac317a9;p=python

Merge 3.5
---

ebbd83e70ddfac4798fe7712f0a3bce22ac317a9