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

Merge 3.5
---

7f955ab16a92ec4cb1494ca765cfbfb29df8b5f5