From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 3 Dec 2016 23:57:15 +0000 (-0800)
Subject: Null merge with 3.6
X-Git-Tag: v3.7.0a1~1850
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed04388328c800675f1eb914b8f7971ef5c47980;p=python

Null merge with 3.6
---

ed04388328c800675f1eb914b8f7971ef5c47980