From: Yury Selivanov <yury@magic.io>
Date: Wed, 9 Nov 2016 00:19:52 +0000 (-0500)
Subject: Merge 3.5
X-Git-Tag: v3.6.0b4~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49ffdf6bb280e2ed3652cac6e3e371dade7f2f2b;p=python

Merge 3.5
---

49ffdf6bb280e2ed3652cac6e3e371dade7f2f2b