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

Merge 3.4
---

1334f83de2e20829118226306147e05cdb8f2725