From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 16 Jul 2015 23:34:09 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1963
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c959769297198dbaff86b0e0b93375ef429359ef;p=python

Merge with 3.5
---

c959769297198dbaff86b0e0b93375ef429359ef