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

Merge 3.5
---

4990289bbf6d51130855fd0a54c3726f60ee9fdf