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

Merge from 3.6
---

64a2f9e88258c558cc72246546199c795bef4568