From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 31 Oct 2015 20:07:44 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfb03a470c8a51f9f59c7315bd8187df778022a0;p=python

Merge from 3.5
---

bfb03a470c8a51f9f59c7315bd8187df778022a0