From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 5 Aug 2015 16:46:40 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1834
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4aac06ae50f987991dd583ef851c76c598380ba1;p=python

Merge 3.5
---

4aac06ae50f987991dd583ef851c76c598380ba1