From: Tal Einat <taleinat@gmail.com>
Date: Sun, 7 Jun 2015 16:27:51 +0000 (+0300)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~2097
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8cd6632f61a1cf47674f0f265c8fbf44c8063dc;p=python

merge 3.5
---

f8cd6632f61a1cf47674f0f265c8fbf44c8063dc