From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 16 Nov 2015 20:12:54 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1043
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43b53091f08204c7aa5f539697d75c99ac4cb96f;p=python

Merge 3.5
---

43b53091f08204c7aa5f539697d75c99ac4cb96f