From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 16 Dec 2016 17:06:17 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.7.0a1~1736
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5173cc143dd36adbef4fb13c3b6b30677e59d2e3;p=python

Merge heads
---

5173cc143dd36adbef4fb13c3b6b30677e59d2e3