From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 5 Feb 2017 01:37:00 +0000 (-0800)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~1408
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c67fdd24b232d96fc9fd4ba73c165f02ef67cff;p=python

Merge from 3.6
---

8c67fdd24b232d96fc9fd4ba73c165f02ef67cff