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

Merge 3.5
---

1cecec5da5cd332afb9e574e72ac9d17e9697f59