From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 20 Nov 2015 17:44:12 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~1019
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ded66891173cfa461251a44e300913a395c0ffca;p=python

Merge 3.5
---

ded66891173cfa461251a44e300913a395c0ffca