From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sat, 12 Sep 2015 21:53:42 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1569
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd8f9d603e7580c497b3833b34968ecd75a8ab9f;p=python

Merge 3.5
---

cd8f9d603e7580c497b3833b34968ecd75a8ab9f