From: Yury Selivanov <yselivanov@sprymix.com>
Date: Mon, 16 Nov 2015 17:43:46 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1045
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efbee31b4733c83b7358cce0ed49312f8df92608;p=python

Merge 3.5
---

efbee31b4733c83b7358cce0ed49312f8df92608