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

Merge 3.5
---

84fdc4958f7a89976bccaf42e1d876777fa00831