From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Dec 2015 16:34:30 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~926
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bb6fa85e1c749ba691b62a79fccb809ba80a816;p=python

Merge 3.5
---

8bb6fa85e1c749ba691b62a79fccb809ba80a816