From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 30 Dec 2016 11:24:23 +0000 (+0100)
Subject: Merge 3.5.
X-Git-Tag: v3.6.1rc1~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a50006c9773e80542a8d7a4cf3dad332e16c30fc;p=python

Merge 3.5.
---

a50006c9773e80542a8d7a4cf3dad332e16c30fc