From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 15 Dec 2015 05:38:38 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c008d83dcd92c6de5f29b81121a1792eed9b913;p=python

Merge 3.5
---

2c008d83dcd92c6de5f29b81121a1792eed9b913