From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 20 Nov 2015 17:40:02 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1021
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa31c35e5539099174ac461bf2fde509adafcc9a;p=python

Merge 3.5
---

aa31c35e5539099174ac461bf2fde509adafcc9a