From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 23 Sep 2015 00:30:28 +0000 (-0700)
Subject: Merge from 3.4
X-Git-Tag: v3.5.1rc1~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81a618315eee447ddfab18b44210586fee0ed3f1;p=python

Merge from 3.4
---

81a618315eee447ddfab18b44210586fee0ed3f1