From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 8 Oct 2015 17:00:55 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1301
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e8d6ed2f4522c172c825441523dbd88fd1f4d62;p=python

Merge from 3.5
---

6e8d6ed2f4522c172c825441523dbd88fd1f4d62