From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 13 Nov 2015 17:29:03 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.1rc1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c73771afd853586bc69863e3bba155349a132f44;p=python

Merge 3.4
---

c73771afd853586bc69863e3bba155349a132f44