From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 06:28:08 +0000 (+0000)
Subject: Merge 3.5 into 3.6
X-Git-Tag: v3.6.0a1~1628
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f560c16e54aae0a1873a551e097e6e41e6aed54;p=python

Merge 3.5 into 3.6
---

3f560c16e54aae0a1873a551e097e6e41e6aed54