From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sat, 12 Sep 2015 21:51:16 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1570
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd9114c2e447a31f79cb0425b3446f59759c38aa;p=python

Merge 3.5
---

dd9114c2e447a31f79cb0425b3446f59759c38aa