From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 25 Jul 2016 01:06:51 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a4~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81fb0e33d6f869146934e760cd18044214ec825d;p=python

Merge from 3.5
---

81fb0e33d6f869146934e760cd18044214ec825d