From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 7 Nov 2015 18:08:04 +0000 (-0800)
Subject: Null merge from 3.4
X-Git-Tag: v3.6.0a1~1103^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65b77d625e3ad17f3963d32dc13e209ee7406ba2;p=python

Null merge from 3.4
---

65b77d625e3ad17f3963d32dc13e209ee7406ba2