From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sun, 13 Sep 2015 12:29:30 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1558
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1487104109c5889d7d4229f0cf2ff6372f86d71;p=python

Merge 3.5
---

e1487104109c5889d7d4229f0cf2ff6372f86d71