From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 23 Nov 2015 02:20:37 +0000 (-0800)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~1003
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9450f6b437987bd9cc07d53c352ab5abaadd8c51;p=python

Merge from 3.5
---

9450f6b437987bd9cc07d53c352ab5abaadd8c51