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

Merge 3.5
---

1215227d1f2be84ec25f080bce2865f6e3134f80