From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 12 Jan 2017 17:46:11 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.7.0a1~1573
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a16825a74a4bfd587993e7320cde3b5391f548a0;p=python

Merge heads
---

a16825a74a4bfd587993e7320cde3b5391f548a0