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

Merge 3.5
---

a5f1563441357d4c9a8f2149e03e39c522cbe2cf