From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sat, 12 Sep 2015 19:52:20 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd8611d57234fe286640414f5cafa0543331ad45;p=python

Merge 3.5
---

cd8611d57234fe286640414f5cafa0543331ad45