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

Merge 3.5
---

6bb33d6ac3157b5eac9808516d1bf2f70513dddd