From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 10 Sep 2015 02:46:51 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1612
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f1f6e4618fa4c054377f78425f07b1e4409c832;p=python

Merge 3.5
---

4f1f6e4618fa4c054377f78425f07b1e4409c832