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

Merge from 3.5
---

ebbad80e85e8f33b2cbb183fc26c615b7f3730e2