From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 5 Aug 2015 18:35:36 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1831
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1065278f23dbf6c8a783dd0d4b937616959ddfd3;p=python

Merge with 3.5
---

1065278f23dbf6c8a783dd0d4b937616959ddfd3