From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 9 Jun 2016 06:18:56 +0000 (-0700)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cff5ec6be36b0eef010d8b2afc444e60838217d0;p=python

merge heads
---

cff5ec6be36b0eef010d8b2afc444e60838217d0