From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 15 Jul 2016 19:01:07 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a4~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3823aabb72124b40c8d79f270d34f91fb394ab39;p=python

Merge from 3.5
---

3823aabb72124b40c8d79f270d34f91fb394ab39