From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 26 Aug 2015 17:04:06 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1734
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f344a89ef36970ed495aeb2aadbf37199753c6e;p=python

Merge 3.5
---

7f344a89ef36970ed495aeb2aadbf37199753c6e