From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 26 Oct 2016 02:36:13 +0000 (-0500)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0b3~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9aa4d3308fe854e015a1ae3d04cbc20974d27c2;p=python

Merge from 3.5
---

d9aa4d3308fe854e015a1ae3d04cbc20974d27c2