From: Yury Selivanov <yselivanov@sprymix.com>
Date: Fri, 11 Dec 2015 16:33:21 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0a1~927
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f8475a008213060a747c84a191f626f2212e3ab;p=python

Merge 3.5
---

0f8475a008213060a747c84a191f626f2212e3ab