From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 8 Aug 2015 16:13:26 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1811
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f363ff18ebfe37d6ab816d1cd739f96f9d0d9ab;p=python

Merge with 3.5
---

0f363ff18ebfe37d6ab816d1cd739f96f9d0d9ab