From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Sep 2015 01:45:08 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1591
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9026924604a127ff23a712df92ac111e2fe59f08;p=python

Merge 3.5
---

9026924604a127ff23a712df92ac111e2fe59f08