From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 16 Nov 2015 20:12:44 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.1rc1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfff959c07428001cf961fcf95e5ef10256ae8c2;p=python

Merge 3.4
---

cfff959c07428001cf961fcf95e5ef10256ae8c2