From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sat, 30 May 2015 14:49:27 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.5.0b2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=802d45b6604b82ee636fdd795cc6a7d9e655855d;p=python

Merge 3.5
---

802d45b6604b82ee636fdd795cc6a7d9e655855d