From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 15 Jan 2015 17:17:18 +0000 (-0800)
Subject: Null merge from 3.4
X-Git-Tag: v3.5.0a1~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=782fb24acc4e3daf33315ab9a0dc4d2aed0dff7d;p=python

Null merge from 3.4
---

782fb24acc4e3daf33315ab9a0dc4d2aed0dff7d