From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 4 Aug 2015 19:57:05 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1843
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4451cbed2223af639def3350d2e6451a40dc7b60;p=python

Merge 3.5
---

4451cbed2223af639def3350d2e6451a40dc7b60