From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 9 Sep 2015 03:28:17 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1631^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6cf627f931e6e79315bee6b1fb5f571cc2b3620;p=python

Merge 3.5
---

a6cf627f931e6e79315bee6b1fb5f571cc2b3620