From: Tal Einat <taleinat@gmail.com>
Date: Tue, 9 Jun 2015 15:42:18 +0000 (+0300)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0b3~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86a60bfb08cd87f570b1330bfbd244ff2cb781f6;p=python

Merge from 3.4
---

86a60bfb08cd87f570b1330bfbd244ff2cb781f6