From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 17 Aug 2015 17:02:53 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1771
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e35cac3a1d3cfdc12ca4013e3c8b09db0a5e8ba;p=python

Merge 3.5
---

9e35cac3a1d3cfdc12ca4013e3c8b09db0a5e8ba