From: Yury Selivanov <yselivanov@sprymix.com>
Date: Wed, 9 Sep 2015 17:50:12 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1620
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ae505e7d39726cdc8c279c7cb4908e12a39d998;p=python

Merge 3.5
---

0ae505e7d39726cdc8c279c7cb4908e12a39d998