From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 14 Jul 2016 02:58:47 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a4~181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da27c1da8547c0deaab653e8a1818c7e313be8bd;p=python

Merge from 3.5
---

da27c1da8547c0deaab653e8a1818c7e313be8bd