From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 2 Mar 2016 15:41:51 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~542
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45c84cc0ca48d9b664c26971a3b527d60da80ceb;p=python

Merge 3.5
---

45c84cc0ca48d9b664c26971a3b527d60da80ceb