From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 18 Jul 2016 04:58:11 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a4~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e24b98fc3dcb66336fc1ebf42e93fd9a7ed4a86;p=python

Merge from 3.5
---

5e24b98fc3dcb66336fc1ebf42e93fd9a7ed4a86