From: Tal Einat <taleinat@gmail.com>
Date: Tue, 9 Jun 2015 15:42:36 +0000 (+0300)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~2084
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8203ba99ccb33ad66e803f795557e1133b1c1c28;p=python

Merge from 3.5
---

8203ba99ccb33ad66e803f795557e1133b1c1c28