From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 16 Nov 2015 17:47:25 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1044
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=caf6452af2844efdc44ec63b6a7a7f578ebcc200;p=python

Merge 3.5
---

caf6452af2844efdc44ec63b6a7a7f578ebcc200