From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 11 Sep 2015 15:47:55 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1581
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87182ab8ba5b054c636455ec9865c99c9b38a48f;p=python

Merge with 3.5
---

87182ab8ba5b054c636455ec9865c99c9b38a48f