From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 15 Dec 2015 05:30:32 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~910
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e93f407a0f4929895c4a07d65edddc7dbc494534;p=python

Merge 3.5
---

e93f407a0f4929895c4a07d65edddc7dbc494534