From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 31 Aug 2015 15:45:11 +0000 (-0400)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1718
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c994cd21de90e48b5c636fed55e13ffaacbde231;p=python

Merge 3.5
---

c994cd21de90e48b5c636fed55e13ffaacbde231