From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 4 Aug 2015 19:56:53 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.6.0a1~1843^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78c89eb0aceeeaf67f537b8f6df8a3640acf4151;p=python

Merge 3.4
---

78c89eb0aceeeaf67f537b8f6df8a3640acf4151