From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 25 Dec 2016 14:23:42 +0000 (+0200)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.1rc1~260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8803d21e75d486e1c3a037906b01eb2de82f5a7;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5.
---

a8803d21e75d486e1c3a037906b01eb2de82f5a7