From: Martin Panter <vadmium+py@gmail.com>
Date: Wed, 8 Jun 2016 12:45:30 +0000 (+0000)
Subject: Merge from 3.5; no changes to 3.6
X-Git-Tag: v3.6.0a2~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7764f4d12c8aab5f017b67b624cd60f6b8c4909b;p=python

Merge from 3.5; no changes to 3.6
---

7764f4d12c8aab5f017b67b624cd60f6b8c4909b