From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 13 Sep 2015 21:41:24 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1552
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba5747b8bd985a43198cf17b6561a33b05062956;p=python

Merge with 3.5
---

ba5747b8bd985a43198cf17b6561a33b05062956