From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 27 Jul 2015 21:59:00 +0000 (-0700)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1898
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c11d91b5089bba386751a9d0ba88377f5b4321f;p=python

Merge with 3.5
---

9c11d91b5089bba386751a9d0ba88377f5b4321f