From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 23 Sep 2015 00:35:55 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1471
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=697c43d389462f3f1f2ff5fb867442d712f77cb4;p=python

Merge from 3.5
---

697c43d389462f3f1f2ff5fb867442d712f77cb4