From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 15 Aug 2015 21:38:29 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1786
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=711dc147772b57137a71457b4005ee6d0bc2cada;p=python

Merge with 3.5
---

711dc147772b57137a71457b4005ee6d0bc2cada