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

Merge 3.5
---

f3d9ef9ba6733613909534fa18d421681eb8a625