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

Merge from 3.4
---

5b1640cd2bcab78b3c14ac425b9d2c6d7926df17