From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 17 Dec 2015 00:40:11 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.6.0a1~902^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e277a3dc5159b2ad61e57fa77bff485328864cc5;p=python

Merge 3.4
---

e277a3dc5159b2ad61e57fa77bff485328864cc5