From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 12 Oct 2015 01:05:27 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79e60dec1b03534ce68547ef097c822b870fddbe;p=python

Merge from 3.5
---

79e60dec1b03534ce68547ef097c822b870fddbe