From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 11 Jan 2017 18:17:34 +0000 (+0200)
Subject: Merge with 3.5.
X-Git-Tag: v3.6.1rc1~181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3159b33a956141c209113c4be99fe82b60024dd1;p=python

Merge with 3.5.
---

3159b33a956141c209113c4be99fe82b60024dd1