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

Null merge from 3.5
---

a2365c1de2e94b9709f8d776252a9849666614c8