From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 27 Jun 2016 16:35:32 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=435c979990884d0e71ee0570442b97291dd50d34;p=python

Merge from 3.5
---

435c979990884d0e71ee0570442b97291dd50d34