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

Merge 3.5
---

1030c10c882399a09b534a013b16012d2abf9c31