From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 20 Nov 2016 02:41:31 +0000 (-0800)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~1954
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1325ee0938be932b08bc2290389f82b17d505b2a;p=python

Merge from 3.6
---

1325ee0938be932b08bc2290389f82b17d505b2a