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

Merge 3.5
---

d38718d41965489efefe323b97024cd8c69eecaf