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

Merge 3.4
---

3563ccc9a0f9fc829a6a45a0a1717f03ca234e03