From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sat, 31 Oct 2015 17:29:35 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05a4a9cbaa252fbf57d77f507c01207c73b5b10f;p=python

Merge 3.5
---

05a4a9cbaa252fbf57d77f507c01207c73b5b10f