From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 14 Oct 2015 17:41:52 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8c1309cba1194642893f1aadbca95117678af72;p=python

Merge from 3.5
---

b8c1309cba1194642893f1aadbca95117678af72