From: Yury Selivanov <yselivanov@sprymix.com>
Date: Sun, 2 Aug 2015 14:25:06 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1857
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68669d57d68c99cb96ff34b43ca6e3af91df9112;p=python

Merge 3.5
---

68669d57d68c99cb96ff34b43ca6e3af91df9112