From: Yury Selivanov <yselivanov@sprymix.com>
Date: Tue, 18 Aug 2015 03:43:54 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1768
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02aa3426d393642999bb4f0e1a3125b9391ca399;p=python

Merge 3.5
---

02aa3426d393642999bb4f0e1a3125b9391ca399