From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 9 Jan 2017 12:11:51 +0000 (+0100)
Subject: Merge 3.5.
X-Git-Tag: v3.6.1rc1~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e660335b7e168bb5e25a5813fefdff71737d63fa;p=python

Merge 3.5.
---

e660335b7e168bb5e25a5813fefdff71737d63fa