From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 31 May 2015 23:40:12 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~2134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25e17388630d8533bc2bafd9b12a3165ebd955ae;p=python

Merge with 3.5
---

25e17388630d8533bc2bafd9b12a3165ebd955ae