From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 9 Sep 2015 16:24:16 +0000 (-0400)
Subject: Merge 3.5 heads
X-Git-Tag: v3.5.1rc1~407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c506277697617d5d97476347be2b943743263d9b;p=python

Merge 3.5 heads
---

c506277697617d5d97476347be2b943743263d9b