From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sun, 13 Sep 2015 05:39:16 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1563
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd316c71aeb085d78729e8565fd35edad054058c;p=python

Merge 3.5
---

bd316c71aeb085d78729e8565fd35edad054058c