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

Merge 3.5
---

8aa184692ea4b02525dd99682ec8f8210bdbd4c6