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

Merge 3.5
---

cbed49550a5454e1ac351f8b31738ebbd1c5d364