From: Gregory P. Smith <greg@krypto.org>
Date: Mon, 14 Dec 2015 04:06:35 +0000 (-0800)
Subject: merge head
X-Git-Tag: v3.6.0a1~912^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c084eb77d69ec1527fad943a4031b1b29193e98;p=python

merge head
---

8c084eb77d69ec1527fad943a4031b1b29193e98