From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 17 Dec 2015 01:41:39 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~899
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4222dba184c8bf41a2c5051c351757dcbb08f01;p=python

Merge 3.5
---

d4222dba184c8bf41a2c5051c351757dcbb08f01