From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 25 Dec 2016 14:24:15 +0000 (+0200)
Subject: Merge from 3.6.
X-Git-Tag: v3.7.0a1~1688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc3723bbf6289c9c02f5f8af6f0786230fb66c8d;p=python

Merge from 3.6.
---

fc3723bbf6289c9c02f5f8af6f0786230fb66c8d