From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Sep 2015 03:37:16 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1588
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b55a9300a99e078056b1ce879d63b872212460f;p=python

Merge 3.5
---

4b55a9300a99e078056b1ce879d63b872212460f