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

Merge 3.5
---

38b6468ff2b9f07002399d8be4fb4572435ab842