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

Merge 3.5
---

d11223e0d65c42e3637f00cac595028373838436