From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 18 Sep 2016 00:27:41 +0000 (-0700)
Subject: Null merge from 3.5
X-Git-Tag: v3.6.0b2~178
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13740531279291a9f2f71dd7c7b04ddbcdda3baf;p=python

Null merge from 3.5
---

13740531279291a9f2f71dd7c7b04ddbcdda3baf