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

Merge 3.5
---

c545f1ce8f1191d27a7c137630080d8c30b01154