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

Merge 3.5
---

095492a980c09c7c3b8b0494437f086162ad9900