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

Merge 3.5
---

cfcc2bdcb2e721050fc0ddbdafd2f6452b845a24