From: Barry Warsaw <barry@python.org>
Date: Mon, 11 Jan 2016 20:53:51 +0000 (-0500)
Subject: Merge heads.
X-Git-Tag: v3.6.0a1~792
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=305e3557e94735bbccde8ab2b881c93afa067e13;p=python

Merge heads.
---

305e3557e94735bbccde8ab2b881c93afa067e13