From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Dec 2015 16:33:08 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.6.0a1~927^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7888e6702776c0e619fbf10857534fc18b0d1a1a;p=python

Merge 3.4
---

7888e6702776c0e619fbf10857534fc18b0d1a1a