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

Merge 3.5
---

29832bb19d29ccb94b0b46d6a9d5ac662a41298d