From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 7 Sep 2015 05:31:08 +0000 (-0700)
Subject: Null merge from 3.4
X-Git-Tag: v3.6.0a1~1650^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eeeff706e51fa51ce6227f32e4c00025344ee7df;p=python

Null merge from 3.4
---

eeeff706e51fa51ce6227f32e4c00025344ee7df