From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 25 Jun 2016 23:43:26 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=523ccd135c340a9e532c8bdf355cb43f8e259904;p=python

Merge from 3.5
---

523ccd135c340a9e532c8bdf355cb43f8e259904