From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 23 Sep 2015 00:31:33 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1472
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82f6cabbeec991214525b0ba7031cc94793767bf;p=python

Merge from 3.5
---

82f6cabbeec991214525b0ba7031cc94793767bf