From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 11 Aug 2015 04:01:00 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1801
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b9cd7fa2e4b73bf97a1b28c3f3a7b15c9302941;p=python

Merge from 3.5
---

5b9cd7fa2e4b73bf97a1b28c3f3a7b15c9302941