From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 18 Jul 2015 16:29:03 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1958
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7066cd7d54a20ef724781179b502b5c7eb3042ec;p=python

Merge with 3.5
---

7066cd7d54a20ef724781179b502b5c7eb3042ec