From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 17 Dec 2015 10:35:05 +0000 (+0000)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~896
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f27d4382e89b59bd7bd5209ade332492b7ec235;p=python

Merge from 3.5
---

7f27d4382e89b59bd7bd5209ade332492b7ec235