From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 5 Nov 2015 19:30:41 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2149ed1c0d1b76a6cba0a2c452163360cc0106a;p=python

Merge 3.5
---

a2149ed1c0d1b76a6cba0a2c452163360cc0106a