From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 20 Nov 2015 17:44:03 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.1rc1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e342b8e8fe6a3359094688ce63bc0131ed7d416c;p=python

Merge 3.4
---

e342b8e8fe6a3359094688ce63bc0131ed7d416c