From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 16 Jan 2016 20:41:03 +0000 (-0800)
Subject: Merge
X-Git-Tag: v3.6.0a1~760
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6932b5b3a3503110c720938a6baffe7dec6926ce;p=python

Merge
---

6932b5b3a3503110c720938a6baffe7dec6926ce